Skip to content

fs: add synchronous retries to rimraf #30785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cjihrig wants to merge 3 commits into from
Closed

fs: add synchronous retries to rimraf #30785

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0f690b
fs: add synchronous retries to rimraf
cjihrig Dec 4, 2019
8c2ca28
fixup! fs: add synchronous retries to rimraf
cjihrig Dec 8, 2019
2dd26b0
fs: reduce unnecessary sync rimraf retries
cjihrig Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fs: add synchronous retries to rimraf 
This commit gives the synchronous version of rimraf the same
linear retry logic as the asynchronous version. Prior to this
commit, sync rimraf kept retrying the operation as soon as
possible until maxRetries was reached.
  • Loading branch information
@cjihrig
cjihrig committed Dec 8, 2019
commit b0f690ba5585374ed945c23e47149f3ce7f6d3ad
7 changes: 5 additions & 2 deletions lib/internal/fs/rimraf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const {
} = require('fs');
const { join } = require('path');
const { setTimeout } = require('timers');
const { sleep } = require('internal/util');
const notEmptyErrorCodes = new Set(['ENOTEMPTY', 'EEXIST', 'EPERM']);
const retryErrorCodes = new Set(
['EBUSY', 'EMFILE', 'ENFILE', 'ENOTEMPTY', 'EPERM']);
Expand Down Expand Up @@ -208,10 +209,12 @@ function _rmdirSync(path, options, originalErr) {
rimrafSync(join(path, child), options);
});

for (let i = 0; i < options.maxRetries + 1; i++) {
for (let i = 1; i <= options.maxRetries + 1; i++) {
try {
return rmdirSync(path, options);
} catch {} // Ignore errors.
} catch {
sleep(i * options.retryDelay);
Comment thread
cjihrig marked this conversation as resolved.
Outdated
}
}
}
}
Expand Down