From: Haomai Wang <haomaiwang@gmail.com>
Date: Thu, 30 Jun 2016 08:43:51 +0000 (+0800)
Subject: msg/async/AsyncMessenger: make sure all connection cleanup handler finished
X-Git-Tag: ses5-milestone5~429^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af1d3ed36f2efcca5816dee890515ead5f1eccb5;p=ceph.git

msg/async/AsyncMessenger: make sure all connection cleanup handler finished

Fixes: http://tracker.ceph.com/issues/16552
Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 029942d6677b..b0e465c71fed 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -639,6 +639,7 @@ void AsyncMessenger::wait()
 
   // close all connections
   shutdown_connections(false);
+  pool->barrier();
 
   ldout(cct, 10) << __func__ << ": done." << dendl;
   ldout(cct, 1) << __func__ << " complete." << dendl;