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

Add constant for disabled snapshot interval (#32236) 

Slot::MAX was used to specify that a type of snapshots should not be
created; define a constant to be that value and reference the constant
to have a single point of edit.
This commit is contained in:
steviez 2023-06-26 12:26:56 -05:00 committed by GitHub
parent 95fae285a4
commit 77b587aa4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/accounts_hash_verifier.rs
View File

@ -587,7 +587,9 @@ mod tests {
super::*, super::*,
rand::seq::SliceRandom, rand::seq::SliceRandom,
solana_gossip::contact_info::ContactInfo, solana_gossip::contact_info::ContactInfo,
solana_runtime::snapshot_package::SnapshotType, solana_runtime::{
snapshot_package::SnapshotType, snapshot_utils::DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
},
solana_sdk::{ solana_sdk::{
signature::{Keypair, Signer}, signature::{Keypair, Signer},
timing::timestamp, timing::timestamp,
@ -613,7 +615,7 @@ mod tests {
let full_snapshot_archive_interval_slots = 100; let full_snapshot_archive_interval_slots = 100;
let snapshot_config = SnapshotConfig { let snapshot_config = SnapshotConfig {
full_snapshot_archive_interval_slots, full_snapshot_archive_interval_slots,
incremental_snapshot_archive_interval_slots: Slot::MAX, incremental_snapshot_archive_interval_slots: DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
..SnapshotConfig::default() ..SnapshotConfig::default()
}; };
let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap(); let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap();

29
core/src/validator.rs
View File

@ -95,6 +95,7 @@ use {
snapshot_hash::StartingSnapshotHashes, snapshot_hash::StartingSnapshotHashes,
snapshot_utils::{ snapshot_utils::{
self, clean_orphaned_account_snapshot_dirs, move_and_async_delete_path_contents, self, clean_orphaned_account_snapshot_dirs, move_and_async_delete_path_contents,
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
}, },
}, },
solana_sdk::{ solana_sdk::{
@ -2268,13 +2269,14 @@ pub fn is_snapshot_config_valid(
let incremental_snapshot_interval_slots = let incremental_snapshot_interval_slots =
snapshot_config.incremental_snapshot_archive_interval_slots; snapshot_config.incremental_snapshot_archive_interval_slots;
let is_incremental_config_valid = if incremental_snapshot_interval_slots == Slot::MAX { let is_incremental_config_valid =
true if incremental_snapshot_interval_slots == DISABLED_SNAPSHOT_ARCHIVE_INTERVAL {
} else { true
incremental_snapshot_interval_slots >= accounts_hash_interval_slots } else {
&& incremental_snapshot_interval_slots % accounts_hash_interval_slots == 0 incremental_snapshot_interval_slots >= accounts_hash_interval_slots
&& full_snapshot_interval_slots > incremental_snapshot_interval_slots && incremental_snapshot_interval_slots % accounts_hash_interval_slots == 0
}; && full_snapshot_interval_slots > incremental_snapshot_interval_slots
};
full_snapshot_interval_slots >= accounts_hash_interval_slots full_snapshot_interval_slots >= accounts_hash_interval_slots
&& full_snapshot_interval_slots % accounts_hash_interval_slots == 0 && full_snapshot_interval_slots % accounts_hash_interval_slots == 0
@ -2563,19 +2565,22 @@ mod tests {
assert!(is_snapshot_config_valid( assert!(is_snapshot_config_valid(
&new_snapshot_config( &new_snapshot_config(
snapshot_utils::DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS, snapshot_utils::DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS,
Slot::MAX DISABLED_SNAPSHOT_ARCHIVE_INTERVAL
), ),
default_accounts_hash_interval default_accounts_hash_interval
)); ));
assert!(is_snapshot_config_valid( assert!(is_snapshot_config_valid(
&new_snapshot_config( &new_snapshot_config(
snapshot_utils::DEFAULT_INCREMENTAL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS, snapshot_utils::DEFAULT_INCREMENTAL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS,
Slot::MAX DISABLED_SNAPSHOT_ARCHIVE_INTERVAL
), ),
default_accounts_hash_interval default_accounts_hash_interval
)); ));
assert!(is_snapshot_config_valid( assert!(is_snapshot_config_valid(
&new_snapshot_config(Slot::MAX, Slot::MAX), &new_snapshot_config(
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL
),
Slot::MAX Slot::MAX
)); ));
@ -2620,8 +2625,8 @@ mod tests {
)); ));
assert!(is_snapshot_config_valid( assert!(is_snapshot_config_valid(
&SnapshotConfig { &SnapshotConfig {
full_snapshot_archive_interval_slots: Slot::MAX, full_snapshot_archive_interval_slots: DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
incremental_snapshot_archive_interval_slots: Slot::MAX, incremental_snapshot_archive_interval_slots: DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
..SnapshotConfig::new_load_only() ..SnapshotConfig::new_load_only()
}, },
100 100

14
core/tests/snapshots.rs
View File

@ -31,6 +31,7 @@ use {
snapshot_utils::{ snapshot_utils::{
self, self,
SnapshotVersion::{self, V1_2_0}, SnapshotVersion::{self, V1_2_0},
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
}, },
status_cache::MAX_CACHE_ENTRIES, status_cache::MAX_CACHE_ENTRIES,
}, },
@ -199,7 +200,7 @@ fn run_bank_forks_snapshot_n<F>(
cluster_type, cluster_type,
set_root_interval, set_root_interval,
set_root_interval, set_root_interval,
Slot::MAX, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
); );
let bank_forks = &mut snapshot_test_config.bank_forks; let bank_forks = &mut snapshot_test_config.bank_forks;
@ -327,8 +328,13 @@ fn test_concurrent_snapshot_packaging(
const MAX_BANK_SNAPSHOTS_TO_RETAIN: usize = 8; const MAX_BANK_SNAPSHOTS_TO_RETAIN: usize = 8;
// Set up snapshotting config // Set up snapshotting config
let mut snapshot_test_config = let mut snapshot_test_config = SnapshotTestConfig::new(
SnapshotTestConfig::new(snapshot_version, cluster_type, 1, 1, Slot::MAX); snapshot_version,
cluster_type,
1,
1,
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
);
let bank_forks = &mut snapshot_test_config.bank_forks; let bank_forks = &mut snapshot_test_config.bank_forks;
let snapshot_config = &snapshot_test_config.snapshot_config; let snapshot_config = &snapshot_test_config.snapshot_config;
@ -582,7 +588,7 @@ fn test_slots_to_snapshot(snapshot_version: SnapshotVersion, cluster_type: Clust
cluster_type, cluster_type,
(*add_root_interval * num_set_roots * 2) as Slot, (*add_root_interval * num_set_roots * 2) as Slot,
(*add_root_interval * num_set_roots * 2) as Slot, (*add_root_interval * num_set_roots * 2) as Slot,
Slot::MAX, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
); );
let mut current_bank = snapshot_test_config.bank_forks[0].clone(); let mut current_bank = snapshot_test_config.bank_forks[0].clone();
let request_sender = AbsRequestSender::new(snapshot_sender); let request_sender = AbsRequestSender::new(snapshot_sender);

11
local-cluster/tests/common/mod.rs
View File

@ -21,7 +21,10 @@ use {
}, },
solana_rpc_client::rpc_client::RpcClient, solana_rpc_client::rpc_client::RpcClient,
solana_runtime::{ solana_runtime::{
snapshot_config::SnapshotConfig, snapshot_utils::create_accounts_run_and_snapshot_dirs, snapshot_config::SnapshotConfig,
snapshot_utils::{
create_accounts_run_and_snapshot_dirs, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
},
}, },
solana_sdk::{ solana_sdk::{
account::AccountSharedData, account::AccountSharedData,
@ -477,9 +480,9 @@ impl SnapshotValidatorConfig {
) -> SnapshotValidatorConfig { ) -> SnapshotValidatorConfig {
assert!(accounts_hash_interval_slots > 0); assert!(accounts_hash_interval_slots > 0);
assert!(full_snapshot_archive_interval_slots > 0); assert!(full_snapshot_archive_interval_slots > 0);
assert!(full_snapshot_archive_interval_slots != Slot::MAX); assert!(full_snapshot_archive_interval_slots != DISABLED_SNAPSHOT_ARCHIVE_INTERVAL);
assert!(full_snapshot_archive_interval_slots % accounts_hash_interval_slots == 0); assert!(full_snapshot_archive_interval_slots % accounts_hash_interval_slots == 0);
if incremental_snapshot_archive_interval_slots != Slot::MAX { if incremental_snapshot_archive_interval_slots != DISABLED_SNAPSHOT_ARCHIVE_INTERVAL {
assert!(incremental_snapshot_archive_interval_slots > 0); assert!(incremental_snapshot_archive_interval_slots > 0);
assert!( assert!(
incremental_snapshot_archive_interval_slots % accounts_hash_interval_slots == 0 incremental_snapshot_archive_interval_slots % accounts_hash_interval_slots == 0
@ -536,7 +539,7 @@ pub fn setup_snapshot_validator_config(
) -> SnapshotValidatorConfig { ) -> SnapshotValidatorConfig {
SnapshotValidatorConfig::new( SnapshotValidatorConfig::new(
snapshot_interval_slots, snapshot_interval_slots,
Slot::MAX, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
snapshot_interval_slots, snapshot_interval_slots,
num_account_paths, num_account_paths,
) )

1
runtime/src/snapshot_utils.rs
View File

@ -96,6 +96,7 @@ pub const DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN: NonZeroUsize =
unsafe { NonZeroUsize::new_unchecked(2) }; unsafe { NonZeroUsize::new_unchecked(2) };
pub const DEFAULT_MAX_INCREMENTAL_SNAPSHOT_ARCHIVES_TO_RETAIN: NonZeroUsize = pub const DEFAULT_MAX_INCREMENTAL_SNAPSHOT_ARCHIVES_TO_RETAIN: NonZeroUsize =
unsafe { NonZeroUsize::new_unchecked(4) }; unsafe { NonZeroUsize::new_unchecked(4) };
pub const DISABLED_SNAPSHOT_ARCHIVE_INTERVAL: Slot = Slot::MAX;
pub const FULL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^snapshot-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz|tar\.lz4)$"; pub const FULL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^snapshot-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz|tar\.lz4)$";
pub const INCREMENTAL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^incremental-snapshot-(?P<base>[[:digit:]]+)-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz|tar\.lz4)$"; pub const INCREMENTAL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^incremental-snapshot-(?P<base>[[:digit:]]+)-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz|tar\.lz4)$";

18
validator/src/main.rs
View File

@ -49,7 +49,7 @@ use {
snapshot_config::{SnapshotConfig, SnapshotUsage}, snapshot_config::{SnapshotConfig, SnapshotUsage},
snapshot_utils::{ snapshot_utils::{
self, create_all_accounts_run_and_snapshot_dirs, create_and_canonicalize_directories, self, create_all_accounts_run_and_snapshot_dirs, create_and_canonicalize_directories,
ArchiveFormat, SnapshotVersion, ArchiveFormat, SnapshotVersion, DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
}, },
}, },
solana_sdk::{ solana_sdk::{
@ -1530,14 +1530,20 @@ pub fn main() {
incremental_snapshot_interval_slots, incremental_snapshot_interval_slots,
) )
} else { } else {
(incremental_snapshot_interval_slots, Slot::MAX) (
incremental_snapshot_interval_slots,
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
)
} }
} else { } else {
(Slot::MAX, Slot::MAX) (
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL,
)
}; };
validator_config.snapshot_config = SnapshotConfig { validator_config.snapshot_config = SnapshotConfig {
usage: if full_snapshot_archive_interval_slots == Slot::MAX { usage: if full_snapshot_archive_interval_slots == DISABLED_SNAPSHOT_ARCHIVE_INTERVAL {
SnapshotUsage::LoadOnly SnapshotUsage::LoadOnly
} else { } else {
SnapshotUsage::LoadAndGenerate SnapshotUsage::LoadAndGenerate
@ -1573,8 +1579,8 @@ pub fn main() {
\n\tfull snapshot interval: {} \ \n\tfull snapshot interval: {} \
\n\tincremental snapshot interval: {} \ \n\tincremental snapshot interval: {} \
\n\taccounts hash interval: {}", \n\taccounts hash interval: {}",
if full_snapshot_archive_interval_slots == Slot::MAX { "disabled".to_string() } else { full_snapshot_archive_interval_slots.to_string() }, if full_snapshot_archive_interval_slots == DISABLED_SNAPSHOT_ARCHIVE_INTERVAL { "disabled".to_string() } else { full_snapshot_archive_interval_slots.to_string() },
if incremental_snapshot_archive_interval_slots == Slot::MAX { "disabled".to_string() } else { incremental_snapshot_archive_interval_slots.to_string() }, if incremental_snapshot_archive_interval_slots == DISABLED_SNAPSHOT_ARCHIVE_INTERVAL { "disabled".to_string() } else { incremental_snapshot_archive_interval_slots.to_string() },
validator_config.accounts_hash_interval_slots); validator_config.accounts_hash_interval_slots);
exit(1); exit(1);