fs: reduce unnecessary sync rimraf retries

rimraf should only retry if certain errors are encountered. Additionally, there is no point sleeping if an error occurs on the last try. PR-URL: #30785 Fixes: #30580 Refs: #30569 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Richard Lau <[email protected]>
nodejs · Jan 14, 2020 · 50afd34 · 50afd34
1 parent 4e05bf0
commit 50afd34
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/internal/fs/rimraf.js b/lib/internal/fs/rimraf.js
@@ -209,12 +209,19 @@ function _rmdirSync(path, options, originalErr) {
         rimrafSync(join(path, child), options);
       });
 
-      for (let i = 1; i <= options.maxRetries + 1; i++) {
+      const tries = options.maxRetries + 1;
+
+      for (let i = 1; i <= tries; i++) {
         try {
           return rmdirSync(path, options);
-        } catch {
-          if (options.retryDelay > 0)
+        } catch (err) {
+          // Only sleep if this is not the last try, and the delay is greater
+          // than zero, and an error was encountered that warrants a retry.
+          if (retryErrorCodes.has(err.code) &&
+              i < tries &&
+              options.retryDelay > 0) {
             sleep(i * options.retryDelay);
+          }
         }
       }
     }