From: Sage Weil <sage@redhat.com>
Date: Sun, 16 Apr 2017 17:28:23 +0000 (-0400)
Subject: mgr/MgrClient: fix reconnect event leak
X-Git-Tag: v12.0.2~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14431%2Fhead;p=ceph.git

mgr/MgrClient: fix reconnect event leak

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index e1fa439c2fd5..2f558c0614ad 100644
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -49,6 +49,11 @@ void MgrClient::shutdown()
 {
   Mutex::Locker l(lock);
 
+  if (connect_retry_callback) {
+    timer.cancel_event(connect_retry_callback);
+    connect_retry_callback = nullptr;
+  }
+
   // forget about in-flight commands if we are prematurely shut down
   // (e.g., by control-C)
   command_table.clear();