CURATOR-262: Fixed integer overflow issue with sleepMs

apache · Feb 26, 2016 · 630c009 · 630c009
1 parent 33c19d6
commit 630c009
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
@@ -45,7 +45,7 @@ public int getMaxSleepTimeMs()
     }
 
     @Override
-    protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+    protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
     {
         return Math.min(maxSleepTimeMs, super.getSleepTimeMs(retryCount, elapsedTimeMs));
     }

diff --git a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
@@ -65,10 +65,10 @@ public int getBaseSleepTimeMs()
     }
 
     @Override
-    protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+    protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
     {
         // copied from Hadoop's RetryPolicies.java
-        int sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << (retryCount + 1)));
+        long sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << (retryCount + 1)));
         if ( sleepMs > maxSleepMs )
         {
             log.warn(String.format("Sleep extension too large (%d). Pinning to %d", sleepMs, maxSleepMs));

diff --git a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
@@ -32,7 +32,7 @@ public RetryNTimes(int n, int sleepMsBetweenRetries)
     }
 
     @Override
-    protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+    protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
     {
         return sleepMsBetweenRetries;
     }

diff --git a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
@@ -42,7 +42,7 @@ public boolean allowRetry(int retryCount, long elapsedTimeMs, RetrySleeper sleep
     }
 
     @Override
-    protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+    protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
     {
         return sleepMsBetweenRetries;
     }

diff --git a/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java b/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java
@@ -55,5 +55,5 @@ public boolean allowRetry(int retryCount, long elapsedTimeMs, RetrySleeper sleep
         return false;
     }
 
-    protected abstract int   getSleepTimeMs(int retryCount, long elapsedTimeMs);
+    protected abstract long   getSleepTimeMs(int retryCount, long elapsedTimeMs);
 }