From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sun, 9 Oct 2016 02:55:12 +0000 (+0800)
Subject: mgr: shutdown finisher in a graceful way
X-Git-Tag: v11.1.0~588^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11386%2Fhead;p=ceph.git

mgr: shutdown finisher in a graceful way

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

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 834eb9111f6..653f1314418 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -338,6 +338,7 @@ void Mgr::shutdown()
 
   // Then stop the finisher to ensure its enqueued contexts aren't going
   // to touch references to the things we're about to tear down
+  finisher.wait_for_empty();
   finisher.stop();
 }