Merge pull request #1453 from manofthepeace/exponentialBackoff

fix: exponentialBackoffExpireAt should start at 0
smallrye · Dec 4, 2023 · 9064ba0 · 9064ba0
2 parents 3de0f29 + 33fba4f
commit 9064ba0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/helpers/ExponentialBackoff.java b/implementation/src/main/java/io/smallrye/mutiny/helpers/ExponentialBackoff.java
@@ -104,7 +104,7 @@ public static Function<Multi<Throwable>, Publisher<Long>> randomExponentialBacko
         AtomicInteger index = new AtomicInteger();
         return t -> t
                 .onItem().transformToUni(failure -> {
-                    int iteration = index.incrementAndGet();
+                    int iteration = index.getAndIncrement();
                     Duration delay = getNextDelay(firstBackoff, maxBackoff, jitterFactor, iteration);
 
                     long checkTime = System.currentTimeMillis() + delay.toMillis();

diff --git a/implementation/src/test/java/io/smallrye/mutiny/groups/UniOnFailureRetryTest.java b/implementation/src/test/java/io/smallrye/mutiny/groups/UniOnFailureRetryTest.java
@@ -160,6 +160,24 @@ public void testExpireInRetryWithBackOff() {
         assertThat(value).isEqualTo("done");
     }
 
+    @Test
+    public void testExpireInRetryWithBackOffNotBounded() {
+        AtomicInteger count = new AtomicInteger();
+        String value = Uni.createFrom().<String> emitter(e -> {
+            int attempt = count.getAndIncrement();
+            if (attempt == 0) {
+                e.fail(new Exception("boom"));
+            } else {
+                e.complete("done");
+            }
+        })
+                .onFailure().retry().withBackOff(Duration.ofMillis(100)).withJitter(0)
+                .expireIn(150L)
+                .await().atMost(Duration.ofSeconds(5));
+
+        assertThat(value).isEqualTo("done");
+    }
+
     @Test
     public void testExpireAtRetryWithBackOff() {
         AtomicInteger count = new AtomicInteger();