From 7e852dc56c5e0d55459b9f00c175e9caa85dea86 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Tue, 24 Oct 2023 15:59:47 -0600 Subject: [PATCH 1/3] validator: deprecates `--disable-accounts-disk-index` --- validator/src/cli.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/validator/src/cli.rs b/validator/src/cli.rs index bd82c0a4ac2727..d11672217986ec 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -1240,12 +1240,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> { .takes_value(true) .help("How much memory the accounts index can consume. If this is exceeded, some account index entries will be stored on disk."), ) - .arg( - Arg::with_name("disable_accounts_disk_index") - .long("disable-accounts-disk-index") - .help("Disable the disk-based accounts index if it is enabled by default.") - .conflicts_with("accounts_index_memory_limit_mb") - ) .arg( Arg::with_name("accounts_index_bins") .long("accounts-index-bins") @@ -1871,6 +1865,12 @@ fn deprecated_arguments() -> Vec { .help("Skip ledger verification at validator bootup."), replaced_by: "skip-startup-ledger-verification", ); + add_arg!( + Arg::with_name("disable_accounts_disk_index") + .long("disable-accounts-disk-index") + .help("Disable the disk-based accounts index if it is enabled by default.") + .conflicts_with("accounts_index_memory_limit_mb") + ) res } From 09b202e7b314a0349a4419a1ec2fd4d5ebc7ff57 Mon Sep 17 00:00:00 2001 From: Will Hickey Date: Sun, 29 Oct 2023 13:51:01 -0500 Subject: [PATCH 2/3] Fix checks failure --- validator/src/cli.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/validator/src/cli.rs b/validator/src/cli.rs index d11672217986ec..bba9272e730788 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -1865,12 +1865,10 @@ fn deprecated_arguments() -> Vec { .help("Skip ledger verification at validator bootup."), replaced_by: "skip-startup-ledger-verification", ); - add_arg!( - Arg::with_name("disable_accounts_disk_index") - .long("disable-accounts-disk-index") - .help("Disable the disk-based accounts index if it is enabled by default.") - .conflicts_with("accounts_index_memory_limit_mb") - ) + add_arg!(Arg::with_name("disable_accounts_disk_index") + .long("disable-accounts-disk-index") + .help("Disable the disk-based accounts index if it is enabled by default.") + .conflicts_with("accounts_index_memory_limit_mb")); res } From 61f732a1cb944e3f12446d88d7ad5b4bca6f981c Mon Sep 17 00:00:00 2001 From: Will Hickey Date: Mon, 30 Oct 2023 10:01:07 -0500 Subject: [PATCH 3/3] Move disable_accounts_disk_index arg to alphabetical order --- validator/src/cli.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/validator/src/cli.rs b/validator/src/cli.rs index bba9272e730788..79bbe76a77b0f5 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -1781,6 +1781,10 @@ fn deprecated_arguments() -> Vec { Ok(()) } })); + add_arg!(Arg::with_name("disable_accounts_disk_index") + .long("disable-accounts-disk-index") + .help("Disable the disk-based accounts index if it is enabled by default.") + .conflicts_with("accounts_index_memory_limit_mb")); add_arg!( Arg::with_name("disable_quic_servers") .long("disable-quic-servers") @@ -1865,10 +1869,6 @@ fn deprecated_arguments() -> Vec { .help("Skip ledger verification at validator bootup."), replaced_by: "skip-startup-ledger-verification", ); - add_arg!(Arg::with_name("disable_accounts_disk_index") - .long("disable-accounts-disk-index") - .help("Disable the disk-based accounts index if it is enabled by default.") - .conflicts_with("accounts_index_memory_limit_mb")); res }