From: Kefu Chai <kchai@redhat.com>
Date: Tue, 23 May 2017 08:54:57 +0000 (+0800)
Subject: mon/MonClient: cancel pending commands on shutdown
X-Git-Tag: v12.1.0~403^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=83b9449c56b586ee5d0b0da805b9a30805be3f5f;p=ceph-ci.git

mon/MonClient: cancel pending commands on shutdown

Fixes: http://tracker.ceph.com/issues/20051
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index b926076961c..73d1a110d02 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -408,7 +408,10 @@ void MonClient::shutdown()
     delete version_requests.begin()->second;
     version_requests.erase(version_requests.begin());
   }
-
+  while (!mon_commands.empty()) {
+    auto tid = mon_commands.begin()->first;
+    _cancel_mon_command(tid);
+  }
   while (!waiting_for_session.empty()) {
     ldout(cct, 20) << __func__ << " discarding pending message " << *waiting_for_session.front() << dendl;
     waiting_for_session.front()->put();