Merge pull request #15212 from neha-ojha/wip-fix-recovery-sleep-configurable

osd: Implement asynchronous recovery sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc doc/rados/configuration/osd-config-ref.rst
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/osd/OSD.cc
index ec7b565f0d68c4886d8d11a2ea883f7044d5975a,5fe26ba86ad3678951df1b21ea48d7fe49e2e938..5b8b9b402172a8d2cdfe548756225138bea00f69
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -513,9 -480,14 +515,14 @@@ void OSDService::start_shutdown(
      Mutex::Locker l(agent_timer_lock);
      agent_timer.shutdown();
    }
+ 
+   {
+     Mutex::Locker l(recovery_sleep_lock);
+     recovery_sleep_timer.shutdown();
+   }
  }
  
 -void OSDService::shutdown()
 +void OSDService::shutdown_reserver()
  {
    reserver_finisher.wait_for_empty();
    reserver_finisher.stop();

diff --cc src/osd/OSD.h
Simple merge