From: Sage Weil <sage@newdream.net>
Date: Thu, 1 Jun 2017 16:54:58 +0000 (-0500)
Subject: Merge pull request #15212 from neha-ojha/wip-fix-recovery-sleep-configurable
X-Git-Tag: v12.1.0~310
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bcf3e578155943ebf16bfd6b3ee9567b580d355;p=ceph-ci.git

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

osd: Implement asynchronous recovery sleep

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

8bcf3e578155943ebf16bfd6b3ee9567b580d355
diff --cc src/osd/OSD.cc
index ec7b565f0d6,5fe26ba86ad..5b8b9b40217
--- a/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();