mgr: update for start_mon_command int->void

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 090e0aa2f1937a87affaddde5edc8093d9317756..facfc2ea646a5913b1306bdedc8e9cafc69c2935 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -404,10 +404,9 @@ void Mgr::handle_osd_map()
         std::ostringstream cmd;
         cmd << "{\"prefix\": \"osd metadata\", \"id\": "
             << osd_id << "}";
-        int r = monc->start_mon_command(
+        monc->start_mon_command(
             {cmd.str()},
             {}, &c->outbl, &c->outs, c);
-        assert(r == 0);  // start_mon_command defined to not fail
       }
     }
 
@@ -517,10 +516,9 @@ void Mgr::handle_fs_map(MFSMap* m)
       std::ostringstream cmd;
       cmd << "{\"prefix\": \"mds metadata\", \"who\": \""
           << info.name << "\"}";
-      int r = monc->start_mon_command(
+      monc->start_mon_command(
           {cmd.str()},
           {}, &c->outbl, &c->outs, c);
-      assert(r == 0);  // start_mon_command defined to not fail
     }
   }
 }

diff --git a/src/mgr/PyState.cc b/src/mgr/PyState.cc
index 4c8ea9090febaa9e7f482e4dee3aa6a49ea31f43..1836282f270e6eed52ee3d3a951f17a3d4b2dfb2 100644 (file)
--- a/src/mgr/PyState.cc
+++ b/src/mgr/PyState.cc
@@ -99,13 +99,12 @@ ceph_send_command(PyObject *self, PyObject *args)
   Py_DECREF(set_fn);
 
   auto c = new MonCommandCompletion(completion, tag);
-  auto r = global_handle->get_monc().start_mon_command(
+  global_handle->get_monc().start_mon_command(
       {cmd_json},
       {},
       &c->outbl,
       &c->outs,
       c);
-  assert(r == 0);  // start_mon_command is forbidden to fail
 
   Py_RETURN_NONE;
 }