edited typos and fix some logics

snowflakedb · Oct 24, 2023 · 1b4e12c · 1b4e12c
1 parent 3512bbc
commit 1b4e12c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/lib/connection/connection_config.js b/lib/connection/connection_config.js
@@ -982,7 +982,7 @@ function createParameters()
     },
     {
       name: PARAM_RETRY_SF_MAX_SLEEP_TIME,
-      defaultValue: 16,
+      defaultValue: 108,
       validate: isNonNegativeNumber
     }
   ];

diff --git a/lib/services/sf.js b/lib/services/sf.js
@@ -1217,7 +1217,7 @@ StateConnecting.prototype.continue = function ()
           totalTimeout < maxLoginTimeout) 
         {
           numRetries++;
-          const jitter = Util.jitteredSleepTime(numRetries, sleep, cap, totalTimeout, maxLoginTimeout);
+          const jitter = Util.jitteredSleepTime(numRetries, sleep, totalTimeout, maxLoginTimeout);
           sleep = jitter.sleep;
           totalTimeout = jitter.totalTimeout;
           setTimeout(sendRequest, sleep * 1000);

diff --git a/lib/util.js b/lib/util.js
@@ -429,16 +429,10 @@ exports.nextSleepTime = function (
  * @param {Number} maxSleepTime 
  * @returns {JSON} return next sleep Time and totalTime.
  */
-exports.jitteredSleepTime = function (numofRetries, currentSleepTime, maxSleepTime, totalTimeout = 0, maxLoginTimeout = 300) {
-  const nextSleepTime = Math.min(maxSleepTime, 2 ** numofRetries);
-  let sleep = nextSleepTime + getJitter(currentSleepTime);
-  if (totalTimeout + sleep > maxLoginTimeout) {
-    sleep = maxLoginTimeout - totalTimeout;
-    totalTimeout = maxLoginTimeout;
-  }
-  else {
-    totalTimeout += sleep
-  }
+exports.jitteredSleepTime = function (numofRetries, currentSleepTime, totalTimeout, maxLoginTimeout) {
+  const nextSleepTime = Math.min(maxLoginTimeout - totalTimeout, 4 * numofRetries);
+  const sleep = nextSleepTime + getJitter(currentSleepTime);
+  totalTimeout += sleep
 
   return {sleep, totalTimeout}
 }
@@ -479,8 +473,8 @@ exports.chooseRandom = chooseRandom;
  */
 function getJitter (curWaitTime) {
   const multiplicationFactor = chooseRandom(1, -1);
-  const jitterAmmount = 0.5 * curWaitTime * multiplicationFactor;
-  return jitterAmmount;
+  const jitterAmount = 0.5 * curWaitTime * multiplicationFactor;
+  return jitterAmount;
 }
 
 /**

diff --git a/test/unit/util_test.js b/test/unit/util_test.js
@@ -607,15 +607,14 @@ describe('Util', function ()
         },
       ];
 
-    const maxSleepTime = 16;
     const maxLoginTimeout = 300;
-    let currentSleepTime = 1;
+    let currentSleepTime = 4;
     let retryCount = 1;
     let totalTimeout = 1;
     for (const response of errorCodes) {
        assert.strictEqual(Util.isRetryableHttpError(response,true), true);
 
-       const result = Util.jitteredSleepTime(retryCount, currentSleepTime, maxSleepTime, totalTimeout, maxLoginTimeout);
+       const result = Util.jitteredSleepTime(retryCount, currentSleepTime, totalTimeout, maxLoginTimeout);
        const jitter = currentSleepTime / 2
        const nextSleep = 2 ** retryCount;
        currentSleepTime = result.sleep;
@@ -624,6 +623,7 @@ describe('Util', function ()
        assert.ok(currentSleepTime <= nextSleep + jitter || currentSleepTime >= nextSleep - jitter)
        retryCount++;
     }
+
     assert.strictEqual(retryCount, 8);
     assert.ok(totalTimeout <= maxLoginTimeout);
   });