gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename status filename to be consistent (#23501)

Browse Source
This commit is contained in:
HaoranYi
2022-03-07 11:34:35 -06:00
committed by GitHub
parent 08c9a650db
commit 181fffb916
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/snapshot_packager_service.rs
View File

@@ -219,7 +219,7 @@ mod tests {
snapshot_archive_info::SnapshotArchiveInfo, snapshot_archive_info::SnapshotArchiveInfo,
snapshot_package::{SnapshotPackage, SnapshotType}, snapshot_package::{SnapshotPackage, SnapshotType},
snapshot_utils::{ snapshot_utils::{
self, ArchiveFormat, SnapshotVersion, SNAPSHOT_STATUS_CACHE_FILE_NAME, self, ArchiveFormat, SnapshotVersion, SNAPSHOT_STATUS_CACHE_FILENAME,
}, },
}, },
solana_sdk::hash::Hash, solana_sdk::hash::Hash,
@@ -335,7 +335,7 @@ mod tests {
// the source dir for snapshots // the source dir for snapshots
let dummy_slot_deltas: Vec<BankSlotDelta> = vec![]; let dummy_slot_deltas: Vec<BankSlotDelta> = vec![];
snapshot_utils::serialize_snapshot_data_file( snapshot_utils::serialize_snapshot_data_file(
&snapshots_dir.join(SNAPSHOT_STATUS_CACHE_FILE_NAME), &snapshots_dir.join(SNAPSHOT_STATUS_CACHE_FILENAME),
|stream| { |stream| {
serialize_into(stream, &dummy_slot_deltas)?; serialize_into(stream, &dummy_slot_deltas)?;
Ok(()) Ok(())

2
core/tests/snapshots.rs
View File

@@ -544,7 +544,7 @@ mod tests {
snapshot_utils::serialize_snapshot_data_file( snapshot_utils::serialize_snapshot_data_file(
&saved_snapshots_dir &saved_snapshots_dir
.path() .path()
.join(snapshot_utils::SNAPSHOT_STATUS_CACHE_FILE_NAME), .join(snapshot_utils::SNAPSHOT_STATUS_CACHE_FILENAME),
|stream| { |stream| {
serialize_into(stream, &[] as &[BankSlotDelta])?; serialize_into(stream, &[] as &[BankSlotDelta])?;
Ok(()) Ok(())

6
runtime/src/snapshot_utils.rs
View File

@@ -43,7 +43,7 @@ use {
thiserror::Error, thiserror::Error,
}; };
pub const SNAPSHOT_STATUS_CACHE_FILE_NAME: &str = "status_cache"; pub const SNAPSHOT_STATUS_CACHE_FILENAME: &str = "status_cache";
pub const DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS: Slot = 25_000; pub const DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS: Slot = 25_000;
pub const DEFAULT_INCREMENTAL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS: Slot = 100; pub const DEFAULT_INCREMENTAL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS: Slot = 100;
const MAX_SNAPSHOT_DATA_FILE_SIZE: u64 = 32 * 1024 * 1024 * 1024; // 32 GiB const MAX_SNAPSHOT_DATA_FILE_SIZE: u64 = 32 * 1024 * 1024 * 1024; // 32 GiB
@@ -258,7 +258,7 @@ pub fn archive_snapshot_package(
&snapshot_package &snapshot_package
.snapshot_links .snapshot_links
.path() .path()
.join(SNAPSHOT_STATUS_CACHE_FILE_NAME), .join(SNAPSHOT_STATUS_CACHE_FILENAME),
)?; )?;
let mut timer = Measure::start("snapshot_package-package_snapshots"); let mut timer = Measure::start("snapshot_package-package_snapshots");
@@ -1508,7 +1508,7 @@ fn rebuild_bank_from_snapshots(
.as_path() .as_path()
}, },
) )
.join(SNAPSHOT_STATUS_CACHE_FILE_NAME); .join(SNAPSHOT_STATUS_CACHE_FILENAME);
let slot_deltas = deserialize_snapshot_data_file(&status_cache_path, |stream| { let slot_deltas = deserialize_snapshot_data_file(&status_cache_path, |stream| {
info!( info!(
"Rebuilding status cache from {}", "Rebuilding status cache from {}",