Remove timeout locks (#6048)

* Remove locks with timeouts

* Readd test

* Update docs

* Merge remote-tracking branch 'origin/unstable' into pk-cache-timeout

beacon_node/src/cli.rs

@@ -1246,9 +1246,7 @@ pub fn cli_app() -> Command {
         .arg(
             Arg::new("disable-lock-timeouts")
                 .long("disable-lock-timeouts")
-                .help("Disable the timeouts applied to some internal locks by default. This can \
-                       lead to less spurious failures on slow hardware but is considered \
-                       experimental as it may obscure performance issues.")
+                .help("This flag is deprecated and has no effect.")
                 .action(ArgAction::SetTrue)
                 .help_heading(FLAG_HEADER)
                 .display_order(0)

beacon_node/src/config.rs

@@ -753,7 +753,11 @@ pub fn get_config<E: EthSpec>(
     }
 
     if cli_args.get_flag("disable-lock-timeouts") {
-        client_config.chain.enable_lock_timeouts = false;
+        warn!(
+            log,
+            "Ignoring --disable-lock-timeouts";
+            "info" => "this flag is deprecated and will be removed"
+        );
     }
 
     if cli_args.get_flag("disable-proposer-reorgs") {

beacon_node/src/lib.rs

@@ -5,7 +5,6 @@ pub use beacon_chain;
 use beacon_chain::store::LevelDB;
 use beacon_chain::{
     builder::Witness, eth1_chain::CachingEth1Backend, slot_clock::SystemTimeSlotClock,
-    TimeoutRwLock,
 };
 use clap::ArgMatches;
 pub use cli::cli_app;
@@ -73,11 +72,6 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
             )
         }
 
-        if !client_config.chain.enable_lock_timeouts {
-            info!(log, "Disabling lock timeouts globally");
-            TimeoutRwLock::disable_timeouts()
-        }
-
         if let Err(misaligned_forks) = validator_fork_epochs(&spec) {
             warn!(
                 log,