From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 22 Feb 2016 01:11:41 +0000 (+0800)
Subject: OSD: shutdown OSDService in a more graceful way
X-Git-Tag: v10.1.0~311^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e17a0c04733a47ba1521075647dbcb324718545d;p=ceph.git

OSD: shutdown OSDService in a more graceful way

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e7d2ee37c101..8d2842855238 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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();
 
   {