]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/MgrClient: fix reconnect event leak 14431/head
authorSage Weil <sage@redhat.com>
Sun, 16 Apr 2017 17:28:23 +0000 (13:28 -0400)
committerSage Weil <sage@redhat.com>
Sun, 16 Apr 2017 17:28:23 +0000 (13:28 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/MgrClient.cc

index e1fa439c2fd55c98f2f812f81b7c524a07ad5aa2..2f558c0614adb2edbf13fdf66651016f6cc78afe 100644 (file)
@@ -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();