Issue Netflix#421 - Fixed sleep timeout going negative

astyanax-core/src/main/java/com/netflix/astyanax/retry/BoundedExponentialBackoff.java

@@ -34,7 +34,7 @@ public class BoundedExponentialBackoff extends ExponentialBackoff {
 
     private final int maxSleepTimeMs;
 
-    public BoundedExponentialBackoff(int baseSleepTimeMs, int maxSleepTimeMs, int max) {
+    public BoundedExponentialBackoff(long baseSleepTimeMs, int maxSleepTimeMs, int max) {
         super(baseSleepTimeMs, max);
         this.maxSleepTimeMs = maxSleepTimeMs;
     }

astyanax-core/src/main/java/com/netflix/astyanax/retry/ExponentialBackoff.java

@@ -30,9 +30,9 @@ public class ExponentialBackoff extends SleepingRetryPolicy {
     private final int MAX_SHIFT = 30;
 
     private final Random random = new Random();
-    private final int baseSleepTimeMs;
+    private final long baseSleepTimeMs;
 
-    public ExponentialBackoff(int baseSleepTimeMs, int maxAttempts) {
+    public ExponentialBackoff(long baseSleepTimeMs, int maxAttempts) {
         super(maxAttempts);
         this.baseSleepTimeMs = baseSleepTimeMs;
     }
@@ -46,7 +46,7 @@ public long getSleepTimeMs() {
         return baseSleepTimeMs * Math.max(1, random.nextInt(1 << attempt));
     }
 
-    public int getBaseSleepTimeMs() {
+    public long getBaseSleepTimeMs() {
         return baseSleepTimeMs;
     }
 

astyanax-core/src/test/java/com/netflix/astyanax/retry/BoundedExponentialBackoffTest.java

@@ -0,0 +1,18 @@
+package com.netflix.astyanax.retry;
+
+import static com.netflix.astyanax.retry.ExponentialBackoffTest.setAttemptCount;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public final class BoundedExponentialBackoffTest {
+
+    @Test
+    public void testSleepTimeNeverNegative() throws NoSuchFieldException, IllegalAccessException {
+        BoundedExponentialBackoff backoff = new BoundedExponentialBackoff(500, 5000, -1);
+
+        for(int i = 0; i < 1000; i++) {
+            setAttemptCount(backoff, i);
+            assertTrue("Backoff at retry " + i + " was not positive", backoff.getSleepTimeMs() >= 0);
+        }
+    }
+}

astyanax-core/src/test/java/com/netflix/astyanax/retry/ExponentialBackoffTest.java

@@ -0,0 +1,27 @@
+package com.netflix.astyanax.retry;
+
+import java.lang.reflect.Field;
+
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public final class ExponentialBackoffTest {
+
+
+    @Test
+    public void testSleepTimeNeverNegative() throws NoSuchFieldException, IllegalAccessException {
+        ExponentialBackoff backoff = new ExponentialBackoff(500, -1);
+
+        for(int i = 22; i < 1000; i++) {
+            setAttemptCount(backoff, i);
+            assertTrue("Backoff at retry " + i + " was not positive", backoff.getSleepTimeMs() >= 0);
+        }
+    }
+
+    public static void setAttemptCount(SleepingRetryPolicy backoff, int attempt)
+            throws NoSuchFieldException, IllegalAccessException {
+        Field attempts = SleepingRetryPolicy.class.getDeclaredField("attempts");
+        attempts.setAccessible(true);
+        attempts.setInt(backoff, attempt);
+    }
+}