From fddc554d362c58b563f875c9623dbadbb8ff2066 Mon Sep 17 00:00:00 2001 From: steviez Date: Mon, 4 Nov 2024 13:11:12 -0500 Subject: [PATCH] Disallow --rocksdb-shred-compaction fifo in the validator (#3451) The use of fifo compaction in rocksdb is deprecated (as of v2.0). The current behavior emits a warning if fifo is set. This change removes "fifo" as an option, leaving "level" as the only valid value for --rocksdb-shred-compaction --- CHANGELOG.md | 2 ++ validator/src/cli.rs | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa50b2f2d62ec4..1ec93c59020276 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ Release channels have their own copy of this changelog: * removed the unreleased `redelegate` instruction processor and CLI commands (#2213) * Banks-client: * relax functions to use `&self` instead of `&mut self` (#2591) + * `agave-validator`: + * Remove the deprecated value of `fifo` for `--rocksdb-shred-compaction` (#3451) * Changes * SDK: * removed the `respan` macro. This was marked as "internal use only" and was no longer used internally. diff --git a/validator/src/cli.rs b/validator/src/cli.rs index e413d1b1f7371f..851ce6bcc31573 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -666,14 +666,12 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> { .long("rocksdb-shred-compaction") .value_name("ROCKSDB_COMPACTION_STYLE") .takes_value(true) - .possible_values(&["level", "fifo"]) + .possible_values(&["level"]) .default_value(&default_args.rocksdb_shred_compaction) .help( "Controls how RocksDB compacts shreds. *WARNING*: You will lose your \ Blockstore data when you switch between options. Possible values are: \ - 'level': stores shreds using RocksDB's default (level) compaction. \ - 'fifo': stores shreds under RocksDB's FIFO compaction. This option is more \ - efficient on disk-write-bytes of the Blockstore.", + 'level': stores shreds using RocksDB's default (level) compaction.", ), ) .arg(