diff --git a/core/src/snapshot_packager_service.rs b/core/src/snapshot_packager_service.rs index f36150f31..4db4dbfb3 100644 --- a/core/src/snapshot_packager_service.rs +++ b/core/src/snapshot_packager_service.rs @@ -133,7 +133,8 @@ mod tests { } // Create a packageable snapshot - let output_tar_path = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path); + let output_tar_path = + snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path); let snapshot_package = SnapshotPackage::new( 5, vec![], diff --git a/core/tests/bank_forks.rs b/core/tests/bank_forks.rs index c3a3653c8..e7ad14b4d 100644 --- a/core/tests/bank_forks.rs +++ b/core/tests/bank_forks.rs @@ -78,7 +78,7 @@ mod tests { .as_ref() .unwrap() .snapshot_path, - snapshot_utils::get_snapshot_tar_path(snapshot_package_output_path), + snapshot_utils::get_snapshot_archive_path(snapshot_package_output_path), ) .unwrap(); @@ -135,7 +135,9 @@ mod tests { slot_snapshot_paths .last() .expect("no snapshots found in path"), - snapshot_utils::get_snapshot_tar_path(&snapshot_config.snapshot_package_output_path), + snapshot_utils::get_snapshot_archive_path( + &snapshot_config.snapshot_package_output_path, + ), &snapshot_config.snapshot_path, &last_bank.src.roots(), ) diff --git a/ledger/src/bank_forks.rs b/ledger/src/bank_forks.rs index 9a7a3c61f..9ceca079c 100644 --- a/ledger/src/bank_forks.rs +++ b/ledger/src/bank_forks.rs @@ -192,7 +192,7 @@ impl BankForks { root, &root_bank.src.roots(), snapshot_package_sender.as_ref().unwrap(), - snapshot_utils::get_snapshot_tar_path(&config.snapshot_package_output_path), + snapshot_utils::get_snapshot_archive_path(&config.snapshot_package_output_path), ); if r.is_err() { warn!("Error generating snapshot for bank: {}, err: {:?}", root, r); diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs index 3ee7aab8a..2a4b57a64 100644 --- a/ledger/src/bank_forks_utils.rs +++ b/ledger/src/bank_forks_utils.rs @@ -26,8 +26,9 @@ pub fn load( fs::create_dir_all(&snapshot_config.snapshot_path) .expect("Couldn't create snapshot directory"); - let tar = - snapshot_utils::get_snapshot_tar_path(&snapshot_config.snapshot_package_output_path); + let tar = snapshot_utils::get_snapshot_archive_path( + &snapshot_config.snapshot_package_output_path, + ); if tar.exists() { info!("Loading snapshot package: {:?}", tar); // Fail hard here if snapshot fails to load, don't silently continue diff --git a/ledger/src/snapshot_utils.rs b/ledger/src/snapshot_utils.rs index b414c955a..22405d054 100644 --- a/ledger/src/snapshot_utils.rs +++ b/ledger/src/snapshot_utils.rs @@ -481,7 +481,7 @@ pub fn bank_from_archive>( Ok(bank) } -pub fn get_snapshot_tar_path>(snapshot_output_dir: P) -> PathBuf { +pub fn get_snapshot_archive_path>(snapshot_output_dir: P) -> PathBuf { snapshot_output_dir.as_ref().join("snapshot.tar.bz2") } diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs index 8e91885fa..5b35a36da 100644 --- a/local-cluster/tests/local_cluster.rs +++ b/local-cluster/tests/local_cluster.rs @@ -651,12 +651,13 @@ fn test_snapshot_restart_tower() { .as_ref() .unwrap() .snapshot_package_output_path; - let tar = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path); + let tar = snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path); wait_for_next_snapshot(&cluster, &tar); // Copy tar to validator's snapshot output directory - let validator_tar_path = - snapshot_utils::get_snapshot_tar_path(&validator_snapshot_test_config.snapshot_output_path); + let validator_tar_path = snapshot_utils::get_snapshot_archive_path( + &validator_snapshot_test_config.snapshot_output_path, + ); fs::hard_link(tar, &validator_tar_path).unwrap(); // Restart validator from snapshot, the validator's tower state in this snapshot @@ -702,7 +703,7 @@ fn test_snapshots_blockstore_floor() { trace!("Waiting for snapshot tar to be generated with slot",); - let tar = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path); + let tar = snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path); loop { if tar.exists() { trace!("snapshot tar exists"); @@ -712,8 +713,9 @@ fn test_snapshots_blockstore_floor() { } // Copy tar to validator's snapshot output directory - let validator_tar_path = - snapshot_utils::get_snapshot_tar_path(&validator_snapshot_test_config.snapshot_output_path); + let validator_tar_path = snapshot_utils::get_snapshot_archive_path( + &validator_snapshot_test_config.snapshot_output_path, + ); fs::hard_link(tar, &validator_tar_path).unwrap(); let slot_floor = snapshot_utils::bank_slot_from_archive(&validator_tar_path).unwrap(); @@ -803,7 +805,7 @@ fn test_snapshots_restart_validity() { expected_balances.extend(new_balances); - let tar = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path); + let tar = snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path); wait_for_next_snapshot(&cluster, &tar); // Create new account paths since validator exit is not guaranteed to cleanup RPC threads, diff --git a/validator/src/main.rs b/validator/src/main.rs index 63a85f5ed..0a5d50612 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -323,7 +323,8 @@ fn download_ledger( download_tar_bz2(rpc_addr, "genesis.tar.bz2", ledger_path, false)?; if !no_snapshot_fetch { - let snapshot_package = solana_ledger::snapshot_utils::get_snapshot_tar_path(ledger_path); + let snapshot_package = + solana_ledger::snapshot_utils::get_snapshot_archive_path(ledger_path); if snapshot_package.exists() { fs::remove_file(&snapshot_package) .map_err(|err| format!("error removing {:?}: {}", snapshot_package, err))?;