From: John Spray <john.spray@redhat.com>
Date: Wed, 1 Mar 2017 19:12:41 +0000 (+0000)
Subject: mgr: update for start_mon_command int->void
X-Git-Tag: v12.0.1~93^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13727%2Fhead;p=ceph.git

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 090e0aa2f193..facfc2ea646a 100644
--- 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 4c8ea9090feb..1836282f270e 100644
--- 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;
 }