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

Fixes name of snapshot_utils::get_bank_snapshot_dir() (#31432)

This commit is contained in:
Brooks 2023-05-01 15:28:35 -04:00 committed by GitHub
parent 0a2e897f16
commit fdf7bdae1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/serde_snapshot/tests.rs
View File

@ -320,7 +320,7 @@ fn test_bank_serialize_style(
if reserialize_accounts_hash || incremental_snapshot_persistence { if reserialize_accounts_hash || incremental_snapshot_persistence {
let temp_dir = TempDir::new().unwrap(); let temp_dir = TempDir::new().unwrap();
let slot_dir = snapshot_utils::get_bank_snapshots_dir(&temp_dir, slot); let slot_dir = snapshot_utils::get_bank_snapshot_dir(&temp_dir, slot);
let post_path = slot_dir.join(slot.to_string()); let post_path = slot_dir.join(slot.to_string());
let pre_path = post_path.with_extension(BANK_SNAPSHOT_PRE_FILENAME_EXTENSION); let pre_path = post_path.with_extension(BANK_SNAPSHOT_PRE_FILENAME_EXTENSION);
std::fs::create_dir(&slot_dir).unwrap(); std::fs::create_dir(&slot_dir).unwrap();

20
runtime/src/snapshot_utils.rs
View File

@ -178,7 +178,7 @@ impl BankSnapshotInfo {
) -> std::result::Result<BankSnapshotInfo, SnapshotNewFromDirError> { ) -> std::result::Result<BankSnapshotInfo, SnapshotNewFromDirError> {
// check this directory to see if there is a BankSnapshotPre and/or // check this directory to see if there is a BankSnapshotPre and/or
// BankSnapshotPost file // BankSnapshotPost file
let bank_snapshot_dir = get_bank_snapshots_dir(&bank_snapshots_dir, slot); let bank_snapshot_dir = get_bank_snapshot_dir(&bank_snapshots_dir, slot);
if !bank_snapshot_dir.is_dir() { if !bank_snapshot_dir.is_dir() {
return Err(SnapshotNewFromDirError::InvalidBankSnapshotDir( return Err(SnapshotNewFromDirError::InvalidBankSnapshotDir(
@ -1206,7 +1206,7 @@ pub fn add_bank_snapshot(
let mut add_snapshot_time = Measure::start("add-snapshot-ms"); let mut add_snapshot_time = Measure::start("add-snapshot-ms");
let slot = bank.slot(); let slot = bank.slot();
// bank_snapshots_dir/slot // bank_snapshots_dir/slot
let bank_snapshot_dir = get_bank_snapshots_dir(&bank_snapshots_dir, slot); let bank_snapshot_dir = get_bank_snapshot_dir(&bank_snapshots_dir, slot);
if bank_snapshot_dir.is_dir() { if bank_snapshot_dir.is_dir() {
// There is a time window from when a snapshot directory is created to when its content // There is a time window from when a snapshot directory is created to when its content
// is fully filled to become a full state good to construct a bank from. At the init time, // is fully filled to become a full state good to construct a bank from. At the init time,
@ -1329,7 +1329,7 @@ fn serialize_status_cache(slot_deltas: &[BankSlotDelta], status_cache_path: &Pat
/// Remove the snapshot directory for this slot /// Remove the snapshot directory for this slot
pub fn remove_bank_snapshot(slot: Slot, bank_snapshots_dir: impl AsRef<Path>) -> Result<()> { pub fn remove_bank_snapshot(slot: Slot, bank_snapshots_dir: impl AsRef<Path>) -> Result<()> {
let bank_snapshot_dir = get_bank_snapshots_dir(&bank_snapshots_dir, slot); let bank_snapshot_dir = get_bank_snapshot_dir(&bank_snapshots_dir, slot);
let accounts_hardlinks_dir = bank_snapshot_dir.join("accounts_hardlinks"); let accounts_hardlinks_dir = bank_snapshot_dir.join("accounts_hardlinks");
if fs::metadata(&accounts_hardlinks_dir).is_ok() { if fs::metadata(&accounts_hardlinks_dir).is_ok() {
// This directory contain symlinks to all accounts snapshot directories. // This directory contain symlinks to all accounts snapshot directories.
@ -2830,12 +2830,16 @@ fn verify_slot_deltas_with_history(
Ok(()) Ok(())
} }
pub(crate) fn get_snapshot_file_name(slot: Slot) -> String { /// Returns the file name of the bank snapshot for `slot`
pub fn get_snapshot_file_name(slot: Slot) -> String {
slot.to_string() slot.to_string()
} }
pub(crate) fn get_bank_snapshots_dir(path: impl AsRef<Path>, slot: Slot) -> PathBuf { /// Constructs the path to the bank snapshot directory for `slot` within `bank_snapshots_dir`
path.as_ref().join(slot.to_string()) pub fn get_bank_snapshot_dir(bank_snapshots_dir: impl AsRef<Path>, slot: Slot) -> PathBuf {
bank_snapshots_dir
.as_ref()
.join(get_snapshot_file_name(slot))
} }
fn get_io_error(error: &str) -> SnapshotError { fn get_io_error(error: &str) -> SnapshotError {
@ -3703,7 +3707,7 @@ mod tests {
max_slot: Slot, max_slot: Slot,
) { ) {
for slot in min_slot..max_slot { for slot in min_slot..max_slot {
let snapshot_dir = get_bank_snapshots_dir(bank_snapshots_dir, slot); let snapshot_dir = get_bank_snapshot_dir(bank_snapshots_dir, slot);
fs::create_dir_all(&snapshot_dir).unwrap(); fs::create_dir_all(&snapshot_dir).unwrap();
let snapshot_filename = get_snapshot_file_name(slot); let snapshot_filename = get_snapshot_file_name(slot);
@ -5116,7 +5120,7 @@ mod tests {
.unwrap(); .unwrap();
let accounts_hardlinks_dir = let accounts_hardlinks_dir =
get_bank_snapshots_dir(&bank_snapshots_dir, bank.slot()).join("accounts_hardlinks"); get_bank_snapshot_dir(&bank_snapshots_dir, bank.slot()).join("accounts_hardlinks");
assert!(fs::metadata(&accounts_hardlinks_dir).is_ok()); assert!(fs::metadata(&accounts_hardlinks_dir).is_ok());
let mut hardlink_dirs: Vec<PathBuf> = Vec::new(); let mut hardlink_dirs: Vec<PathBuf> = Vec::new();