From 7210a883eb6facc89c1d0d2da2420c5d9a258b48 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Mon, 13 Dec 2021 08:48:40 -0700 Subject: [PATCH] Revert "Add ledger tool to remove dead slot (#20810) (#20813)" This reverts commit d1ca16e9f86c5234a1465e97932c1908ab427527. --- ledger-tool/src/main.rs | 29 +---------------------------- ledger/src/blockstore.rs | 4 ---- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 230f2a8a36..bbbd267105 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -1032,20 +1032,6 @@ fn main() { .help("Slots to mark dead"), ) ) - .subcommand( - SubCommand::with_name("remove-dead-slot") - .about("Remove the dead flag for a slot") - .arg( - Arg::with_name("slots") - .index(1) - .value_name("SLOTS") - .validator(is_slot) - .takes_value(true) - .multiple(true) - .required(true) - .help("Slots to mark as not dead"), - ) - ) .subcommand( SubCommand::with_name("genesis") .about("Prints the ledger's genesis config") @@ -1777,20 +1763,7 @@ fn main() { for slot in slots { match blockstore.set_dead_slot(slot) { Ok(_) => println!("Slot {} dead", slot), - Err(err) => eprintln!("Failed to set slot {} dead slot: {:?}", slot, err), - } - } - } - ("remove-dead-slot", Some(arg_matches)) => { - let slots = values_t_or_exit!(arg_matches, "slots", Slot); - let blockstore = - open_blockstore(&ledger_path, AccessType::PrimaryOnly, wal_recovery_mode); - for slot in slots { - match blockstore.remove_dead_slot(slot) { - Ok(_) => println!("Slot {} not longer marked dead", slot), - Err(err) => { - eprintln!("Failed to remove dead flag for slot {}, {:?}", slot, err) - } + Err(err) => eprintln!("Failed to set slot {} dead slot: {}", slot, err), } } } diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs index 9c49ba6af0..cb96e4a1bd 100644 --- a/ledger/src/blockstore.rs +++ b/ledger/src/blockstore.rs @@ -3054,10 +3054,6 @@ impl Blockstore { self.dead_slots_cf.put(slot, &true) } - pub fn remove_dead_slot(&self, slot: Slot) -> Result<()> { - self.dead_slots_cf.delete(slot) - } - pub fn store_duplicate_if_not_existing( &self, slot: Slot,