From d75a7a0dfacf2d96d66f1ce22dbf3ba5de522e15 Mon Sep 17 00:00:00 2001 From: Daniel Marbach Date: Tue, 1 Oct 2024 17:15:24 +0200 Subject: [PATCH 1/3] Address races in the repeated failure circuit breaker by introducing explicit state transitions (#1057) --- src/Transport/Receiving/MessagePump.cs | 4 +- .../RepeatedFailuresOverTimeCircuitBreaker.cs | 63 ++++++++++--------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/Transport/Receiving/MessagePump.cs b/src/Transport/Receiving/MessagePump.cs index b0701135..066b7745 100644 --- a/src/Transport/Receiving/MessagePump.cs +++ b/src/Transport/Receiving/MessagePump.cs @@ -65,11 +65,13 @@ public Task Init(Func onMessage, Func { }; + circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker($"'{settings.InputQueue}'", timeToWaitBeforeTriggeringCircuitBreaker, ex => { criticalError.Raise("Failed to receive message from Azure Service Bus.", ex); - }); + }, noOp, noOp); return Task.CompletedTask; } diff --git a/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs b/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs index e6183438..80ae22d4 100644 --- a/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs +++ b/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs @@ -5,13 +5,17 @@ using System.Threading.Tasks; using Logging; - class RepeatedFailuresOverTimeCircuitBreaker + sealed class RepeatedFailuresOverTimeCircuitBreaker { public RepeatedFailuresOverTimeCircuitBreaker(string name, TimeSpan timeToWaitBeforeTriggering, - Action triggerAction) + Action triggerAction, + Action armedAction, + Action disarmedAction) { this.name = name; this.triggerAction = triggerAction; + this.armedAction = armedAction; + this.disarmedAction = disarmedAction; this.timeToWaitBeforeTriggering = timeToWaitBeforeTriggering; timer = new Timer(CircuitBreakerTriggered); @@ -19,58 +23,61 @@ public RepeatedFailuresOverTimeCircuitBreaker(string name, TimeSpan timeToWaitBe public void Success() { - var oldValue = Interlocked.Exchange(ref failureCount, 0); + var previousState = Interlocked.CompareExchange(ref circuitBreakerState, Disarmed, Armed); - if (oldValue == 0) + // If the circuit breaker was Armed or triggered before, disarm it + if (previousState == Armed || Interlocked.CompareExchange(ref circuitBreakerState, Disarmed, Triggered) == Triggered) { - return; + _ = timer.Change(Timeout.Infinite, Timeout.Infinite); + Logger.InfoFormat("The circuit breaker for {0} is now disarmed", name); + disarmedAction(); } - - timer.Change(Timeout.Infinite, Timeout.Infinite); - Logger.InfoFormat("The circuit breaker for {0} is now disarmed", name); - triggered = false; } public Task Failure(Exception exception, CancellationToken cancellationToken = default) { - lastException = exception; - var newValue = Interlocked.Increment(ref failureCount); + _ = Interlocked.Exchange(ref lastException, exception); + + // Atomically set state to Armed if it was previously Disarmed + var previousState = Interlocked.CompareExchange(ref circuitBreakerState, Armed, Disarmed); - if (newValue == 1) + if (previousState == Disarmed) { - timer.Change(timeToWaitBeforeTriggering, NoPeriodicTriggering); - Logger.WarnFormat("The circuit breaker for {0} is now in the armed state", name); + armedAction(); + _ = timer.Change(timeToWaitBeforeTriggering, NoPeriodicTriggering); + Logger.WarnFormat("The circuit breaker for {0} is now in the armed state due to {1}", name, exception); } - //If the circuit breaker has been triggered, wait for 10 seconds before proceeding to prevent flooding the logs and hammering the ServiceBus - var delay = triggered ? TimeSpan.FromSeconds(10) : TimeSpan.FromSeconds(1); - - return Task.Delay(delay, cancellationToken); + // If the circuit breaker has been triggered, wait for 10 seconds before proceeding to prevent flooding the logs and hammering the ServiceBus + return Task.Delay(previousState == Triggered ? TimeSpan.FromSeconds(10) : TimeSpan.FromSeconds(1), cancellationToken); } - public void Dispose() - { - timer?.Dispose(); - } + public void Dispose() => timer?.Dispose(); void CircuitBreakerTriggered(object state) { - if (Interlocked.Read(ref failureCount) > 0) + if (Interlocked.CompareExchange(ref circuitBreakerState, Triggered, Armed) != Armed) { - Logger.WarnFormat("The circuit breaker for {0} will now be triggered", name); - triggered = true; - triggerAction(lastException); + return; } + + Logger.WarnFormat("The circuit breaker for {0} will now be triggered with exception {1}", name, lastException); + triggerAction(lastException); } - long failureCount; - volatile bool triggered; + int circuitBreakerState = Disarmed; Exception lastException; readonly string name; readonly Timer timer; readonly TimeSpan timeToWaitBeforeTriggering; readonly Action triggerAction; + readonly Action armedAction; + readonly Action disarmedAction; + + const int Disarmed = 0; + const int Armed = 1; + const int Triggered = 2; static readonly TimeSpan NoPeriodicTriggering = TimeSpan.FromMilliseconds(-1); static readonly ILog Logger = LogManager.GetLogger(); From abba69a6480b9f41e044ca9a2649247f4cbb6924 Mon Sep 17 00:00:00 2001 From: David Boike Date: Wed, 2 Oct 2024 08:39:38 -0500 Subject: [PATCH 2/3] Use locks to serialize arm/disarm actions (#1066) * Use locks to serialize arm/disarm actions * Explicit state lock, Volatile read of state outside lock, actually reduce nesting where possible * Small cosmetics for better readability * Better logging * Verbose comment * Even better logging * Basic test coverage --------- Co-authored-by: danielmarbach --- ...atedFailuresOverTimeCircuitBreakerTests.cs | 222 ++++++++++++++++++ .../RepeatedFailuresOverTimeCircuitBreaker.cs | 172 ++++++++++++-- 2 files changed, 370 insertions(+), 24 deletions(-) create mode 100644 src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs diff --git a/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs b/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs new file mode 100644 index 00000000..9f2fc77b --- /dev/null +++ b/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs @@ -0,0 +1,222 @@ +namespace NServiceBus.Transport.AzureServiceBus.Tests.Receiving +{ + using System; + using System.Diagnostics; + using System.Linq; + using System.Threading; + using System.Threading.Tasks; + using NUnit.Framework; + + // Ideally the circuit breaker would use a time provider to allow for easier testing but that would require a significant refactor + // and we want keep the changes to a minimum for now to allow backporting to older versions. + [TestFixture] + public class RepeatedFailuresOverTimeCircuitBreakerTests + { + [Test] + public async Task Should_disarm_on_success() + { + var armedActionCalled = false; + var disarmedActionCalled = false; + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromMilliseconds(100), + ex => { }, + () => armedActionCalled = true, + () => disarmedActionCalled = true, + TimeSpan.Zero, + TimeSpan.Zero + ); + + await circuitBreaker.Failure(new Exception("Test Exception")); + circuitBreaker.Success(); + + Assert.That(armedActionCalled, Is.True, "The armed action should be called."); + Assert.That(disarmedActionCalled, Is.True, "The disarmed action should be called."); + } + + [Test] + public async Task Should_rethrow_exception_on_success() + { + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromMilliseconds(100), + ex => { }, + () => { }, + () => throw new Exception("Exception from disarmed action"), + timeToWaitWhenTriggered: TimeSpan.Zero, + timeToWaitWhenArmed: TimeSpan.Zero + ); + + await circuitBreaker.Failure(new Exception("Test Exception")); + + var ex = Assert.Throws(() => circuitBreaker.Success()); + Assert.That(ex.Message, Is.EqualTo("Exception from disarmed action")); + } + + [Test] + public async Task Should_trigger_after_failure_timeout() + { + var triggerActionCalled = false; + Exception lastTriggerException = null; + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.Zero, + ex => { triggerActionCalled = true; lastTriggerException = ex; }, + timeToWaitWhenTriggered: TimeSpan.Zero, + timeToWaitWhenArmed: TimeSpan.FromMilliseconds(100) + ); + + await circuitBreaker.Failure(new Exception("Test Exception")); + + Assert.That(triggerActionCalled, Is.True, "The trigger action should be called after timeout."); + Assert.That(lastTriggerException, Is.Not.Null, "The exception passed to the trigger action should not be null."); + } + + [Test] + public void Should_rethrow_exception_on_failure() + { + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromMilliseconds(100), + ex => { }, + () => throw new Exception("Exception from armed action"), + () => { }, + timeToWaitWhenTriggered: TimeSpan.Zero, + timeToWaitWhenArmed: TimeSpan.Zero + ); + + var ex = Assert.ThrowsAsync(async () => await circuitBreaker.Failure(new Exception("Test Exception"))); + Assert.That(ex.Message, Is.EqualTo("Exception from armed action")); + } + + [Test] + public async Task Should_delay_after_trigger_failure() + { + var timeToWaitWhenTriggered = TimeSpan.FromMilliseconds(50); + var timeToWaitWhenArmed = TimeSpan.FromMilliseconds(100); + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.Zero, + _ => { }, + timeToWaitWhenTriggered: timeToWaitWhenTriggered, + timeToWaitWhenArmed: timeToWaitWhenArmed + ); + + var stopWatch = Stopwatch.StartNew(); + + await circuitBreaker.Failure(new Exception("Test Exception")); + await circuitBreaker.Failure(new Exception("Test Exception After Trigger")); + + stopWatch.Stop(); + + Assert.That(stopWatch.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(timeToWaitWhenTriggered.Add(timeToWaitWhenArmed).TotalMilliseconds).Within(20), "The circuit breaker should delay after a triggered failure."); + } + + [Test] + public async Task Should_not_trigger_if_disarmed_before_timeout() + { + var triggerActionCalled = false; + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromMilliseconds(100), + ex => triggerActionCalled = true, + timeToWaitWhenTriggered: TimeSpan.Zero, + timeToWaitWhenArmed: TimeSpan.Zero + ); + + await circuitBreaker.Failure(new Exception("Test Exception")); + circuitBreaker.Success(); + + Assert.That(triggerActionCalled, Is.False, "The trigger action should not be called if the circuit breaker was disarmed."); + } + + [Test] + public async Task Should_handle_concurrent_failure_and_success() + { + var armedActionCalled = false; + var disarmedActionCalled = false; + var triggerActionCalled = false; + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromMilliseconds(100), + ex => triggerActionCalled = true, + () => armedActionCalled = true, + () => disarmedActionCalled = true, + TimeSpan.Zero, + TimeSpan.Zero + ); + + var failureTask = circuitBreaker.Failure(new Exception("Test Exception")); + var successTask = Task.Run(() => + { + Thread.Sleep(50); // Simulate some delay before success + circuitBreaker.Success(); + }); + + await Task.WhenAll(failureTask, successTask); + + Assert.That(armedActionCalled, Is.True, "The armed action should be called."); + Assert.That(disarmedActionCalled, Is.True, "The disarmed action should be called."); + Assert.That(triggerActionCalled, Is.False, "The trigger action should not be called if success occurred before timeout."); + } + + [Test] + public async Task Should_handle_high_concurrent_failure_and_success() + { + var armedActionCalled = 0; + var disarmedActionCalled = 0; + var triggerActionCalled = 0; + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromSeconds(5), + ex => Interlocked.Increment(ref triggerActionCalled), + () => Interlocked.Increment(ref armedActionCalled), + () => Interlocked.Increment(ref disarmedActionCalled), + TimeSpan.Zero, + TimeSpan.FromMilliseconds(25) + ); + + var tasks = Enumerable.Range(0, 1000) + .Select( + i => i % 2 == 0 ? + circuitBreaker.Failure(new Exception($"Test Exception {i}")) : + Task.Run(() => + { + Thread.Sleep(25); // Simulate some delay before success + circuitBreaker.Success(); + }) + ).ToArray(); + + await Task.WhenAll(tasks); + + Assert.That(armedActionCalled, Is.EqualTo(1), "The armed action should be called."); + Assert.That(disarmedActionCalled, Is.EqualTo(1), "The disarmed action should be called."); + Assert.That(triggerActionCalled, Is.Zero, "The trigger action should not be called if success occurred before timeout."); + } + + [Test] + public async Task Should_trigger_after_multiple_failures_and_timeout() + { + var triggerActionCalled = false; + + var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( + "TestCircuitBreaker", + TimeSpan.FromMilliseconds(50), + ex => triggerActionCalled = true, + timeToWaitWhenTriggered: TimeSpan.FromMilliseconds(50), + timeToWaitWhenArmed: TimeSpan.FromMilliseconds(50) + ); + + await circuitBreaker.Failure(new Exception("Test Exception")); + await circuitBreaker.Failure(new Exception("Another Exception After Trigger")); + + Assert.That(triggerActionCalled, Is.True, "The trigger action should be called after repeated failures and timeout."); + } + } +} \ No newline at end of file diff --git a/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs b/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs index 80ae22d4..d2c4c80c 100644 --- a/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs +++ b/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs @@ -1,72 +1,193 @@ -namespace NServiceBus.Transport.AzureServiceBus +#nullable enable + +namespace NServiceBus.Transport.AzureServiceBus { using System; using System.Threading; using System.Threading.Tasks; using Logging; + /// + /// A circuit breaker that is armed on a failure and disarmed on success. After in the + /// armed state, the will fire. The and allow + /// changing other state when the circuit breaker is armed or disarmed. + /// sealed class RepeatedFailuresOverTimeCircuitBreaker { - public RepeatedFailuresOverTimeCircuitBreaker(string name, TimeSpan timeToWaitBeforeTriggering, + /// + /// A circuit breaker that is armed on a failure and disarmed on success. After in the + /// armed state, the will fire. The and allow + /// changing other state when the circuit breaker is armed or disarmed. + /// + /// A name that is output in log messages when the circuit breaker changes states. + /// The time to wait after the first failure before triggering. + /// The action to take when the circuit breaker is triggered. + /// The action to execute on the first failure. + /// Warning: This action is also invoked from within a lock. Any long-running, blocking, or I/O-bound code should be avoided + /// within this action, as it can prevent other threads from proceeding, potentially leading to contention or performance bottlenecks. + /// + /// The action to execute when a success disarms the circuit breaker. + /// Warning: This action is also invoked from within a lock. Any long-running, blocking, or I/O-bound code should be avoided + /// within this action, as it can prevent other threads from proceeding, potentially leading to contention or performance bottlenecks. + /// + /// How long to delay on each failure when in the Triggered state. Defaults to 10 seconds. + /// How long to delay on each failure when in the Armed state. Defaults to 1 second. + /// + /// The and are invoked from within a lock to ensure that arming and disarming + /// actions are serialized and do not execute concurrently. As a result, care must be taken to ensure that these actions do not + /// introduce delays or deadlocks by performing lengthy operations or synchronously waiting on external resources. + /// + /// Best practice: If the logic inside these actions involves blocking or long-running tasks, consider offloading + /// the work to a background task or thread that doesn't hold the lock. + /// + public RepeatedFailuresOverTimeCircuitBreaker( + string name, + TimeSpan timeToWaitBeforeTriggering, Action triggerAction, - Action armedAction, - Action disarmedAction) + Action? armedAction = null, + Action? disarmedAction = null, + TimeSpan? timeToWaitWhenTriggered = default, + TimeSpan? timeToWaitWhenArmed = default) { this.name = name; this.triggerAction = triggerAction; - this.armedAction = armedAction; - this.disarmedAction = disarmedAction; + this.armedAction = armedAction ?? (static () => { }); + this.disarmedAction = disarmedAction ?? (static () => { }); this.timeToWaitBeforeTriggering = timeToWaitBeforeTriggering; + this.timeToWaitWhenTriggered = timeToWaitWhenTriggered ?? TimeSpan.FromSeconds(10); + this.timeToWaitWhenArmed = timeToWaitWhenArmed ?? TimeSpan.FromSeconds(1); timer = new Timer(CircuitBreakerTriggered); } + /// + /// Log a success, disarming the circuit breaker if it was previously armed. + /// public void Success() { - var previousState = Interlocked.CompareExchange(ref circuitBreakerState, Disarmed, Armed); + // Check the status of the circuit breaker, exiting early outside the lock if already disarmed + if (Volatile.Read(ref circuitBreakerState) == Disarmed) + { + return; + } - // If the circuit breaker was Armed or triggered before, disarm it - if (previousState == Armed || Interlocked.CompareExchange(ref circuitBreakerState, Disarmed, Triggered) == Triggered) + lock (stateLock) { + // Recheck state after obtaining the lock + if (circuitBreakerState == Disarmed) + { + return; + } + + circuitBreakerState = Disarmed; + _ = timer.Change(Timeout.Infinite, Timeout.Infinite); - Logger.InfoFormat("The circuit breaker for {0} is now disarmed", name); - disarmedAction(); + Logger.InfoFormat("The circuit breaker for '{0}' is now disarmed.", name); + try + { + disarmedAction(); + } + catch (Exception ex) + { + Logger.Error($"The circuit breaker for '{name}' was unable to execute the disarm action.", ex); + throw; + } } } + /// + /// Log a failure, arming the circuit breaker if it was previously disarmed. + /// + /// The exception that caused the failure. + /// A cancellation token. public Task Failure(Exception exception, CancellationToken cancellationToken = default) { + // Atomically store the exception that caused the circuit breaker to trip _ = Interlocked.Exchange(ref lastException, exception); - // Atomically set state to Armed if it was previously Disarmed - var previousState = Interlocked.CompareExchange(ref circuitBreakerState, Armed, Disarmed); + var previousState = Volatile.Read(ref circuitBreakerState); + if (previousState is Armed or Triggered) + { + return Delay(); + } - if (previousState == Disarmed) + lock (stateLock) { - armedAction(); + // Recheck state after obtaining the lock + previousState = circuitBreakerState; + if (previousState is Armed or Triggered) + { + return Delay(); + } + + circuitBreakerState = Armed; + + try + { + // Executing the action first before starting the timer to ensure that the action is executed before the timer fires + // and the time of the action is not included in the time to wait before triggering. + armedAction(); + } + catch (Exception ex) + { + Logger.Error($"The circuit breaker for '{name}' was unable to execute the arm action.", new AggregateException(ex, exception)); + throw; + } + _ = timer.Change(timeToWaitBeforeTriggering, NoPeriodicTriggering); - Logger.WarnFormat("The circuit breaker for {0} is now in the armed state due to {1}", name, exception); + Logger.WarnFormat("The circuit breaker for '{0}' is now in the armed state due to '{1}' and might trigger in '{2}' when not disarmed.", name, exception, timeToWaitBeforeTriggering); } - // If the circuit breaker has been triggered, wait for 10 seconds before proceeding to prevent flooding the logs and hammering the ServiceBus - return Task.Delay(previousState == Triggered ? TimeSpan.FromSeconds(10) : TimeSpan.FromSeconds(1), cancellationToken); + return Delay(); + + Task Delay() + { + var timeToWait = previousState == Triggered ? timeToWaitWhenTriggered : timeToWaitWhenArmed; + if (Logger.IsDebugEnabled) + { + Logger.DebugFormat("The circuit breaker for '{0}' is delaying the operation by '{1}'.", name, timeToWait); + } + return Task.Delay(timeToWait, cancellationToken); + } } - public void Dispose() => timer?.Dispose(); + /// + /// Disposes the resources associated with the circuit breaker. + /// + public void Dispose() => timer.Dispose(); - void CircuitBreakerTriggered(object state) + void CircuitBreakerTriggered(object? state) { - if (Interlocked.CompareExchange(ref circuitBreakerState, Triggered, Armed) != Armed) + var previousState = Volatile.Read(ref circuitBreakerState); + if (previousState == Disarmed) { return; } - Logger.WarnFormat("The circuit breaker for {0} will now be triggered with exception {1}", name, lastException); - triggerAction(lastException); + lock (stateLock) + { + // Recheck state after obtaining the lock + if (circuitBreakerState == Disarmed) + { + return; + } + + circuitBreakerState = Triggered; + Logger.WarnFormat("The circuit breaker for '{0}' will now be triggered with exception '{1}'.", name, lastException); + + try + { + triggerAction(lastException!); + } + catch (Exception ex) + { + Logger.Fatal($"The circuit breaker for '{name}' was unable to execute the trigger action.", new AggregateException(ex, lastException!)); + } + } } int circuitBreakerState = Disarmed; - Exception lastException; + Exception? lastException; readonly string name; readonly Timer timer; @@ -74,6 +195,9 @@ void CircuitBreakerTriggered(object state) readonly Action triggerAction; readonly Action armedAction; readonly Action disarmedAction; + readonly TimeSpan timeToWaitWhenTriggered; + readonly TimeSpan timeToWaitWhenArmed; + readonly object stateLock = new(); const int Disarmed = 0; const int Armed = 1; From 8e5a1faa460ea7f259eba739c8f365e5ee39c1bb Mon Sep 17 00:00:00 2001 From: David Boike Date: Wed, 2 Oct 2024 08:48:58 -0500 Subject: [PATCH 3/3] Adapt update to older C# version --- ...atedFailuresOverTimeCircuitBreakerTests.cs | 4 ++-- .../RepeatedFailuresOverTimeCircuitBreaker.cs | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs b/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs index 9f2fc77b..ed3bd356 100644 --- a/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs +++ b/src/Tests/Receiving/RepeatedFailuresOverTimeCircuitBreakerTests.cs @@ -41,7 +41,7 @@ public async Task Should_rethrow_exception_on_success() var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( "TestCircuitBreaker", TimeSpan.FromMilliseconds(100), - ex => { }, + x => { }, () => { }, () => throw new Exception("Exception from disarmed action"), timeToWaitWhenTriggered: TimeSpan.Zero, @@ -80,7 +80,7 @@ public void Should_rethrow_exception_on_failure() var circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker( "TestCircuitBreaker", TimeSpan.FromMilliseconds(100), - ex => { }, + x => { }, () => throw new Exception("Exception from armed action"), () => { }, timeToWaitWhenTriggered: TimeSpan.Zero, diff --git a/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs b/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs index d2c4c80c..6fb905f8 100644 --- a/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs +++ b/src/Transport/Receiving/RepeatedFailuresOverTimeCircuitBreaker.cs @@ -23,21 +23,21 @@ sealed class RepeatedFailuresOverTimeCircuitBreaker /// The time to wait after the first failure before triggering. /// The action to take when the circuit breaker is triggered. /// The action to execute on the first failure. - /// Warning: This action is also invoked from within a lock. Any long-running, blocking, or I/O-bound code should be avoided + /// Warning: This action is also invoked from within a lock. Any long-running, blocking, or I/O-bound code should be avoided /// within this action, as it can prevent other threads from proceeding, potentially leading to contention or performance bottlenecks. /// /// The action to execute when a success disarms the circuit breaker. - /// Warning: This action is also invoked from within a lock. Any long-running, blocking, or I/O-bound code should be avoided + /// Warning: This action is also invoked from within a lock. Any long-running, blocking, or I/O-bound code should be avoided /// within this action, as it can prevent other threads from proceeding, potentially leading to contention or performance bottlenecks. /// /// How long to delay on each failure when in the Triggered state. Defaults to 10 seconds. /// How long to delay on each failure when in the Armed state. Defaults to 1 second. /// /// The and are invoked from within a lock to ensure that arming and disarming - /// actions are serialized and do not execute concurrently. As a result, care must be taken to ensure that these actions do not - /// introduce delays or deadlocks by performing lengthy operations or synchronously waiting on external resources. - /// - /// Best practice: If the logic inside these actions involves blocking or long-running tasks, consider offloading + /// actions are serialized and do not execute concurrently. As a result, care must be taken to ensure that these actions do not + /// introduce delays or deadlocks by performing lengthy operations or synchronously waiting on external resources. + /// + /// Best practice: If the logic inside these actions involves blocking or long-running tasks, consider offloading /// the work to a background task or thread that doesn't hold the lock. /// public RepeatedFailuresOverTimeCircuitBreaker( @@ -51,8 +51,8 @@ public RepeatedFailuresOverTimeCircuitBreaker( { this.name = name; this.triggerAction = triggerAction; - this.armedAction = armedAction ?? (static () => { }); - this.disarmedAction = disarmedAction ?? (static () => { }); + this.armedAction = armedAction ?? (() => { }); + this.disarmedAction = disarmedAction ?? (() => { }); this.timeToWaitBeforeTriggering = timeToWaitBeforeTriggering; this.timeToWaitWhenTriggered = timeToWaitWhenTriggered ?? TimeSpan.FromSeconds(10); this.timeToWaitWhenArmed = timeToWaitWhenArmed ?? TimeSpan.FromSeconds(1); @@ -106,7 +106,7 @@ public Task Failure(Exception exception, CancellationToken cancellationToken = d _ = Interlocked.Exchange(ref lastException, exception); var previousState = Volatile.Read(ref circuitBreakerState); - if (previousState is Armed or Triggered) + if (previousState is Armed || previousState is Triggered) { return Delay(); } @@ -115,7 +115,7 @@ public Task Failure(Exception exception, CancellationToken cancellationToken = d { // Recheck state after obtaining the lock previousState = circuitBreakerState; - if (previousState is Armed or Triggered) + if (previousState is Armed || previousState is Triggered) { return Delay(); } @@ -197,7 +197,7 @@ void CircuitBreakerTriggered(object? state) readonly Action disarmedAction; readonly TimeSpan timeToWaitWhenTriggered; readonly TimeSpan timeToWaitWhenArmed; - readonly object stateLock = new(); + readonly object stateLock = new object(); const int Disarmed = 0; const int Armed = 1;