]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: shutdown OSDService in a more graceful way
authorxie xingguo <xie.xingguo@zte.com.cn>
Mon, 22 Feb 2016 01:11:41 +0000 (09:11 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 22 Feb 2016 01:11:41 +0000 (09:11 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc

index e7d2ee37c101f0d37121764dde219979277abe95..8d284285523889544b73f2b4a87107b0afb1c17d 100644 (file)
@@ -460,6 +460,7 @@ void OSDService::start_shutdown()
 
 void OSDService::shutdown()
 {
+  reserver_finisher.wait_for_empty();
   reserver_finisher.stop();
   {
     Mutex::Locker l(watch_lock);
@@ -467,6 +468,7 @@ void OSDService::shutdown()
   }
 
   objecter->shutdown();
+  objecter_finisher.wait_for_empty();
   objecter_finisher.stop();
 
   {