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

Improves error text when snapshot intervals are incompatible (#33551)

This commit is contained in:
Brooks 2023-10-06 07:51:49 -04:00 committed by GitHub
parent ef47c977dc
commit 35a0295376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
validator/src/cli.rs
View File

@ -468,7 +468,8 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
.value_name("NUMBER") .value_name("NUMBER")
.takes_value(true) .takes_value(true)
.default_value(&default_args.full_snapshot_archive_interval_slots) .default_value(&default_args.full_snapshot_archive_interval_slots)
.help("Number of slots between generating full snapshots") .help("Number of slots between generating full snapshots. \
Must be a multiple of the incremental snapshot interval.")
) )
.arg( .arg(
Arg::with_name("maximum_full_snapshots_to_retain") Arg::with_name("maximum_full_snapshots_to_retain")

9
validator/src/main.rs
View File

@ -1588,17 +1588,14 @@ pub fn main() {
validator_config.accounts_hash_interval_slots, validator_config.accounts_hash_interval_slots,
) { ) {
eprintln!("Invalid snapshot configuration provided: snapshot intervals are incompatible. \ eprintln!("Invalid snapshot configuration provided: snapshot intervals are incompatible. \
\n\t- full snapshot interval MUST be a multiple of accounts hash interval (if enabled) \ \n\t- full snapshot interval MUST be a multiple of incremental snapshot interval (if enabled) \
\n\t- incremental snapshot interval MUST be a multiple of accounts hash interval (if enabled) \
\n\t- full snapshot interval MUST be larger than incremental snapshot interval (if enabled) \ \n\t- full snapshot interval MUST be larger than incremental snapshot interval (if enabled) \
\nSnapshot configuration values: \ \nSnapshot configuration values: \
\n\tfull snapshot interval: {} \ \n\tfull snapshot interval: {} \
\n\tincremental snapshot interval: {} \ \n\tincremental snapshot interval: {}",
\n\taccounts hash interval: {}",
if full_snapshot_archive_interval_slots == DISABLED_SNAPSHOT_ARCHIVE_INTERVAL { "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 == DISABLED_SNAPSHOT_ARCHIVE_INTERVAL { "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); );
exit(1); exit(1);
} }