blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaces fs-err in move_and_async_delete_path() (#34903)

This commit is contained in:
Brooks 2024-01-23 12:42:44 -05:00 committed by GitHub
parent bb829c0bcf
commit 4bd8eedc06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/snapshot_utils.rs
View File

@ -570,8 +570,12 @@ pub fn move_and_async_delete_path(path: impl AsRef<Path>) {
path_delete.file_name().unwrap().to_str().unwrap(),
"_to_be_deleted"
));
if let Err(err) = fs_err::rename(&path, &path_delete) {
warn!("Path renaming failed, falling back to rm_dir in sync mode: {err}");
if let Err(err) = fs::rename(&path, &path_delete) {
warn!(
"Cannot async delete, retrying in sync mode: failed to rename '{}' to '{}': {err}",
path.as_ref().display(),
path_delete.display(),
);
// Although the delete here is synchronous, we want to prevent another thread
// from moving & deleting this directory via `move_and_async_delete_path`.
lock.insert(path.as_ref().to_path_buf());
@ -588,8 +592,10 @@ pub fn move_and_async_delete_path(path: impl AsRef<Path>) {
.name("solDeletePath".to_string())
.spawn(move || {
trace!("background deleting {}...", path_delete.display());
let (_, measure_delete) =
measure!(fs_err::remove_dir_all(&path_delete).expect("background delete"));
let (result, measure_delete) = measure!(fs::remove_dir_all(&path_delete));
if let Err(err) = result {
panic!("Failed to async delete '{}': {err}", path_delete.display());
}
trace!(
"background deleting {}... Done, and{measure_delete}",
path_delete.display()