SNOW-859635: Retry Strategy

lib/services/sf.js

@@ -1180,9 +1180,8 @@ StateConnecting.prototype.continue = function ()
     Date.now() : 'FIXEDTIMESTAMP';
   const maxLoginRetries = connectionConfig.getRetrySfMaxLoginRetries();
   const maxLoginTimeout = connectionConfig.getLoginTimeout();
-  const base = connectionConfig.getRetrySfStartingSleepTime();
-  let sleep = base;
-  let totalTimeout = base;
+  let sleep = connectionConfig.getRetrySfStartingSleepTime();;
+  let totalTimeout = sleep;
   Logger.getInstance().debug("Total loginTimeout is for the retries = " + maxLoginTimeout);
   const parent = this;
   const requestCallback = function (err, body)
@@ -1217,7 +1216,7 @@ StateConnecting.prototype.continue = function ()
           totalTimeout < maxLoginTimeout) 
         {
           numRetries++;
-          const jitter = Util.jitteredSleepTime(numRetries, sleep, totalTimeout, base, maxLoginTimeout);
+          const jitter = Util.jitteredSleepTime(numRetries, sleep, totalTimeout, maxLoginTimeout);
           sleep = jitter.sleep;
           totalTimeout = jitter.totalTimeout;
 

lib/util.js

@@ -431,9 +431,10 @@ exports.nextSleepTime = function (
  * @param {Number} maxLoginTimeout
  * @returns {JSON} return next sleep Time and totalTime.
  */
-exports.jitteredSleepTime = function (numofRetries, currentSleepTime, totalTimeout, base, maxLoginTimeout) {
-  const sleep = Math.min((maxLoginTimeout - totalTimeout), getNextSleepTime(numofRetries, base, currentSleepTime) );
+exports.jitteredSleepTime = function (numofRetries, currentSleepTime, totalTimeout, maxLoginTimeout) {
+  const sleep = Math.min((maxLoginTimeout - totalTimeout), getNextSleepTime(numofRetries, currentSleepTime) );
   totalTimeout += sleep
+  console.log(totalTimeout);
   return {sleep, totalTimeout}
 }
 
@@ -460,9 +461,9 @@ exports.chooseRandom = chooseRandom;
  * @param {Number} currentSleepTime 
  * @returns {Boolean} return jitter.
  */
-function getNextSleepTime (numofRetries, base, currentSleepTime) {
+function getNextSleepTime (numofRetries,  currentSleepTime) {
   const multiplicationFactor = chooseRandom(1, -1);
-  const nextSleep = (base * (2 ** (numofRetries - 1)));
+  const nextSleep = (2 ** (numofRetries));
   const jitterAmount = 0.5 * currentSleepTime * multiplicationFactor;
 
   return nextSleep + jitterAmount;

test/unit/util_test.js

@@ -603,17 +603,16 @@ describe('Util', function ()
       ];
 
     const maxLoginTimeout = 300;
-    const base = 4;
-    let currentSleepTime = base;
+    let currentSleepTime = 4;
     let retryCount = 1;
-    let totalTimeout = base;
+    let totalTimeout = currentSleepTime;
     for (const response of errorCodes) {
        retryCount++;
        assert.strictEqual(Util.isRetryableHttpError(response,true), true);
 
-       const result = Util.jitteredSleepTime(retryCount, currentSleepTime, totalTimeout, base, maxLoginTimeout);
+       const result = Util.jitteredSleepTime(retryCount, currentSleepTime, totalTimeout, maxLoginTimeout);
        const jitter = currentSleepTime / 2
-       const nextSleep = base * (2 ** (retryCount-1));
+       const nextSleep = 2 ** retryCount;
        currentSleepTime = result.sleep;
        totalTimeout = result.totalTimeout;