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

Replaces snapshot_utils::remove_bank_snapshot() (#31498)

This commit is contained in:
Brooks 2023-05-05 07:43:28 -04:00 committed by GitHub
parent e4d1fcb3db
commit 4196dbcbf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runtime/src/snapshot_utils.rs
View File

@ -1213,7 +1213,7 @@ pub fn add_bank_snapshot(
// the system may not be booted from the latest snapshot directory, but an older and complete
// directory. Then, when adding new snapshots, the newer incomplete snapshot directory could
// be found. If so, it should be removed.
remove_bank_snapshot(slot, &bank_snapshots_dir)?;
purge_bank_snapshot(&bank_snapshot_dir)?;
} else {
// Even the snapshot directory is not found, still ensure the account snapshot directory
// is also clean. hardlink failure will happen if an old file exists.
@ -1327,12 +1327,6 @@ fn serialize_status_cache(slot_deltas: &[BankSlotDelta], status_cache_path: &Pat
})
}
/// Remove the snapshot directory for this slot
pub fn remove_bank_snapshot(slot: Slot, bank_snapshots_dir: impl AsRef<Path>) -> Result<()> {
let bank_snapshot_dir = get_bank_snapshot_dir(&bank_snapshots_dir, slot);
purge_bank_snapshot(bank_snapshot_dir)
}
#[derive(Debug, Default)]
pub struct BankFromArchiveTimings {
pub rebuild_bank_from_snapshots_us: u64,
@ -2953,10 +2947,10 @@ pub fn purge_old_bank_snapshots(
.rev()
.skip(num_bank_snapshots_to_retain)
.for_each(|bank_snapshot| {
let r = remove_bank_snapshot(bank_snapshot.slot, &bank_snapshots_dir);
let r = purge_bank_snapshot(&bank_snapshot.snapshot_dir);
if r.is_err() {
warn!(
"Couldn't remove bank snapshot at: {}",
"Couldn't purge bank snapshot at: {}",
bank_snapshot.snapshot_dir.display()
);
}
@ -5138,7 +5132,8 @@ mod tests {
hardlink_dirs.push(dst_path);
}
assert!(remove_bank_snapshot(bank.slot(), bank_snapshots_dir).is_ok());
let bank_snapshot_dir = get_bank_snapshot_dir(&bank_snapshots_dir, bank.slot());
assert!(purge_bank_snapshot(bank_snapshot_dir).is_ok());
// When the bank snapshot is removed, all the snapshot hardlink directories should be removed.
assert!(hardlink_dirs.iter().all(|dir| fs::metadata(dir).is_err()));