Fix retry overflow with max delay (#1868)

App-vNext · Jan 4, 2024 · 149b6dd · 149b6dd
1 parent 0348aae
commit 149b6dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Polly.Core/Retry/RetryHelper.cs b/src/Polly.Core/Retry/RetryHelper.cs
@@ -31,6 +31,11 @@ public static TimeSpan GetRetryDelay(
         }
         catch (OverflowException)
         {
+            if (maxDelay is { } value)
+            {
+                return value;
+            }
+
             return TimeSpan.MaxValue;
         }
     }

diff --git a/test/Polly.Core.Tests/Retry/RetryHelperTests.cs b/test/Polly.Core.Tests/Retry/RetryHelperTests.cs
@@ -179,6 +179,14 @@ public void GetRetryDelay_Overflow_ReturnsMaxTimeSpan()
         RetryHelper.GetRetryDelay(DelayBackoffType.Exponential, false, 1000, TimeSpan.FromDays(1), null, ref state, _randomizer).Should().Be(TimeSpan.MaxValue);
     }
 
+    [Fact]
+    public void GetRetryDelay_OverflowWithMaxDelay_ReturnsMaxDelay()
+    {
+        double state = 0;
+
+        RetryHelper.GetRetryDelay(DelayBackoffType.Exponential, false, 1000, TimeSpan.FromDays(1), TimeSpan.FromDays(2), ref state, _randomizer).Should().Be(TimeSpan.FromDays(2));
+    }
+
     [InlineData(1)]
     [InlineData(2)]
     [InlineData(3)]