From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Jul 2019 22:39:46 +0000 (-0500)
Subject: mon/MonClient: tolerate null onfinish during shutdown
X-Git-Tag: v14.2.5~157^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7d8f9e15e8579837013c4ee6f34dba10f14a695;p=ceph.git

mon/MonClient: tolerate null onfinish during shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0fb123a2f6d60b4fdaf22ddcbd54d1b6b8ea96e9)
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 37e4c347f5b..392bc7ff067 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -1117,7 +1117,9 @@ void MonClient::start_mon_command(const vector<string>& cmd,
 {
   std::lock_guard l(monc_lock);
   if (!initialized || stopping) {
-    onfinish->complete(-ECANCELED);
+    if (onfinish) {
+      onfinish->complete(-ECANCELED);
+    }
     return;
   }
   MonCommand *r = new MonCommand(++last_mon_command_tid);
@@ -1152,7 +1154,9 @@ void MonClient::start_mon_command(const string &mon_name,
 {
   std::lock_guard l(monc_lock);
   if (!initialized || stopping) {
-    onfinish->complete(-ECANCELED);
+    if (onfinish) {
+      onfinish->complete(-ECANCELED);
+    }
     return;
   }
   MonCommand *r = new MonCommand(++last_mon_command_tid);
@@ -1174,7 +1178,9 @@ void MonClient::start_mon_command(int rank,
 {
   std::lock_guard l(monc_lock);
   if (!initialized || stopping) {
-    onfinish->complete(-ECANCELED);
+    if (onfinish) {
+      onfinish->complete(-ECANCELED);
+    }
     return;
   }
   MonCommand *r = new MonCommand(++last_mon_command_tid);