mon/MonClient: tolerate null onfinish during shutdown

Signed-off-by: Sage Weil <[email protected]>
byss · Aug 21, 2019 · 0fb123a · 0fb123a
1 parent 0dd2d0f
commit 0fb123a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
@@ -1145,7 +1145,9 @@ void MonClient::start_mon_command(const std::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);
@@ -1180,7 +1182,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);
@@ -1202,7 +1206,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);