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

Reduce the number of snapshots

This commit is contained in:
Michael Vines 2020-11-30 18:16:59 -08:00
parent aebc3a17ce
commit 73111b005f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/snapshots.rs
View File

@ -311,7 +311,7 @@ mod tests {
let saved_slot = 4; let saved_slot = 4;
let mut saved_archive_path = None; let mut saved_archive_path = None;
for forks in 0..MAX_CACHE_ENTRIES + 2 { for forks in 0..snapshot_utils::MAX_SNAPSHOTS + 2 {
let bank = Bank::new_from_parent( let bank = Bank::new_from_parent(
&bank_forks[forks as u64], &bank_forks[forks as u64],
&Pubkey::default(), &Pubkey::default(),
@ -381,7 +381,7 @@ mod tests {
assert!(snapshot_utils::get_snapshot_paths(&snapshots_dir) assert!(snapshot_utils::get_snapshot_paths(&snapshots_dir)
.into_iter() .into_iter()
.map(|path| path.slot) .map(|path| path.slot)
.eq(3..=MAX_CACHE_ENTRIES as u64 + 2)); .eq(3..=snapshot_utils::MAX_SNAPSHOTS as u64 + 2));
// Create a SnapshotPackagerService to create tarballs from all the pending // Create a SnapshotPackagerService to create tarballs from all the pending
// SnapshotPackage's on the channel. By the time this service starts, we have already // SnapshotPackage's on the channel. By the time this service starts, we have already

4
runtime/src/snapshot_utils.rs
View File

@ -6,7 +6,6 @@ use crate::{
bank_from_stream, bank_to_stream, SerdeStyle, SnapshotStorage, SnapshotStorages, bank_from_stream, bank_to_stream, SerdeStyle, SnapshotStorage, SnapshotStorages,
}, },
snapshot_package::{AccountsPackage, AccountsPackageSendError, AccountsPackageSender}, snapshot_package::{AccountsPackage, AccountsPackageSendError, AccountsPackageSender},
status_cache::MAX_CACHE_ENTRIES,
}; };
use bincode::{config::Options, serialize_into}; use bincode::{config::Options, serialize_into};
use bzip2::bufread::BzDecoder; use bzip2::bufread::BzDecoder;
@ -41,6 +40,7 @@ pub const TAR_SNAPSHOTS_DIR: &str = "snapshots";
pub const TAR_ACCOUNTS_DIR: &str = "accounts"; pub const TAR_ACCOUNTS_DIR: &str = "accounts";
pub const TAR_VERSION_FILE: &str = "version"; pub const TAR_VERSION_FILE: &str = "version";
pub const MAX_SNAPSHOTS: usize = 8; // Save some snapshots but not too many
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
const VERSION_STRING_V1_2_0: &str = "1.2.0"; const VERSION_STRING_V1_2_0: &str = "1.2.0";
const DEFAULT_SNAPSHOT_VERSION: SnapshotVersion = SnapshotVersion::V1_2_0; const DEFAULT_SNAPSHOT_VERSION: SnapshotVersion = SnapshotVersion::V1_2_0;
@ -882,7 +882,7 @@ pub fn verify_snapshot_archive<P, Q, R>(
pub fn purge_old_snapshots(snapshot_path: &Path) { pub fn purge_old_snapshots(snapshot_path: &Path) {
// Remove outdated snapshots // Remove outdated snapshots
let slot_snapshot_paths = get_snapshot_paths(snapshot_path); let slot_snapshot_paths = get_snapshot_paths(snapshot_path);
let num_to_remove = slot_snapshot_paths.len().saturating_sub(MAX_CACHE_ENTRIES); let num_to_remove = slot_snapshot_paths.len().saturating_sub(MAX_SNAPSHOTS);
for slot_files in &slot_snapshot_paths[..num_to_remove] { for slot_files in &slot_snapshot_paths[..num_to_remove] {
let r = remove_snapshot(slot_files.slot, snapshot_path); let r = remove_snapshot(slot_files.slot, snapshot_path);
if r.is_err() { if r.is_err() {