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-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8506%2Fhead;p=ceph.git

OSD: shutdown OSDService in a more graceful way

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit e17a0c04733a47ba1521075647dbcb324718545d)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0006f42fa5a8..d2f21cf5dbfc 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -458,6 +458,7 @@ void OSDService::start_shutdown()
 
 void OSDService::shutdown()
 {
+  reserver_finisher.wait_for_empty();
   reserver_finisher.stop();
   {
     Mutex::Locker l(watch_lock);
@@ -465,6 +466,7 @@ void OSDService::shutdown()
   }
 
   objecter->shutdown();
+  objecter_finisher.wait_for_empty();
   objecter_finisher.stop();
 
   {