Remove all snapshots not matching the desired hash
This commit is contained in:
parent
cb29b8dd2a
commit
bf60345b7a
|
@ -178,7 +178,8 @@ pub fn download_snapshot(
|
|||
// Remove all snapshot not matching the desired hash
|
||||
let snapshot_packages = solana_ledger::snapshot_utils::get_snapshot_archives(ledger_path);
|
||||
for (snapshot_package, snapshot_hash) in snapshot_packages.iter() {
|
||||
if snapshot_hash != desired_snapshot_hash {
|
||||
if *snapshot_hash != desired_snapshot_hash {
|
||||
info!("Removing old snapshot: {:?}", snapshot_package);
|
||||
fs::remove_file(snapshot_package)
|
||||
.unwrap_or_else(|err| info!("Failed to remove old snapshot: {:}", err));
|
||||
}
|
||||
|
|
|
@ -509,10 +509,15 @@ fn snapshot_hash_of(archive_filename: &str) -> Option<(Slot, Hash)> {
|
|||
None
|
||||
}
|
||||
|
||||
fn get_snapshot_archives<P: AsRef<Path>>(snapshot_output_dir: P) -> Vec<(PathBuf, (Slot, Hash))> {
|
||||
let files = fs::read_dir(&snapshot_output_dir)
|
||||
.unwrap_or_else(|err| panic!("Unable to read snapshot directory: {}", err));
|
||||
|
||||
pub fn get_snapshot_archives<P: AsRef<Path>>(
|
||||
snapshot_output_dir: P,
|
||||
) -> Vec<(PathBuf, (Slot, Hash))> {
|
||||
match fs::read_dir(&snapshot_output_dir) {
|
||||
Err(err) => {
|
||||
info!("Unable to read snapshot directory: {}", err);
|
||||
vec![]
|
||||
}
|
||||
Ok(files) => {
|
||||
let mut archives: Vec<_> = files
|
||||
.filter_map(|entry| {
|
||||
if let Ok(entry) = entry {
|
||||
|
@ -531,6 +536,8 @@ fn get_snapshot_archives<P: AsRef<Path>>(snapshot_output_dir: P) -> Vec<(PathBuf
|
|||
|
||||
archives.sort_by(|a, b| (b.1).0.cmp(&(a.1).0)); // reverse sort by slot
|
||||
archives
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_highest_snapshot_archive_path<P: AsRef<Path>>(
|
||||
|
|
Loading…
Reference in New Issue