From 5d8ae9628c28992a1ec42413df39b4b06897070a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 19:08:21 +0000 Subject: [PATCH] Do not delete any ledger when `--limit-ledger-size` is not provided (#11740) (cherry picked from commit ea88bbdc3329fbdbd84f07edc696d66ba66447dc) Co-authored-by: Michael Vines --- validator/src/main.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/validator/src/main.rs b/validator/src/main.rs index c5557ca172..3b905a7881 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -481,7 +481,6 @@ fn start_logger(logfile: Option) -> Option> { pub fn main() { let default_dynamic_port_range = &format!("{}-{}", VALIDATOR_PORT_RANGE.0, VALIDATOR_PORT_RANGE.1); - let default_limit_ledger_size = &DEFAULT_MAX_LEDGER_SHREDS.to_string(); let default_genesis_archive_unpacked_size = &MAX_GENESIS_ARCHIVE_UNPACKED_SIZE.to_string(); let matches = App::new(crate_name!()).about(crate_description!()) @@ -726,7 +725,7 @@ pub fn main() { .takes_value(true) .min_values(0) .max_values(1) - .default_value(default_limit_ledger_size) + /* .default_value() intentionally not used here! */ .help("Keep this amount of shreds in root slots."), ) .arg( @@ -1065,7 +1064,10 @@ pub fn main() { } if matches.is_present("limit_ledger_size") { - let limit_ledger_size = value_t_or_exit!(matches, "limit_ledger_size", u64); + let limit_ledger_size = match matches.value_of("limit_ledger_size") { + Some(_) => value_t_or_exit!(matches, "limit_ledger_size", u64), + None => DEFAULT_MAX_LEDGER_SHREDS, + }; if limit_ledger_size < DEFAULT_MIN_MAX_LEDGER_SHREDS { eprintln!( "The provided --limit-ledger-size value was too small, the minimum value is {}",