mon: make MonClient::start_mon_command return void

The int return was misleading because it didn't
really have any error cases.  We sometimes use
ints in APIs in case we want to return an error
in future, but MonClient is an internal interface.

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index c685996a8e64c6d7959327599c602d9b1ef2a83d..71721a0043dad020a78bd482c6fa00afbe012e9d 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -1028,7 +1028,7 @@ void MonClient::_finish_command(MonCommand *r, int ret, string rs)
   delete r;
 }
 
-int MonClient::start_mon_command(const vector<string>& cmd,
+void MonClient::start_mon_command(const vector<string>& cmd,
                                 const bufferlist& inbl,
                                 bufferlist *outbl, string *outs,
                                 Context *onfinish)
@@ -1056,11 +1056,9 @@ int MonClient::start_mon_command(const vector<string>& cmd,
   }
   mon_commands[r->tid] = r;
   _send_command(r);
-  // can't fail
-  return 0;
 }
 
-int MonClient::start_mon_command(const string &mon_name,
+void MonClient::start_mon_command(const string &mon_name,
                                 const vector<string>& cmd,
                                 const bufferlist& inbl,
                                 bufferlist *outbl, string *outs,
@@ -1076,11 +1074,9 @@ int MonClient::start_mon_command(const string &mon_name,
   r->onfinish = onfinish;
   mon_commands[r->tid] = r;
   _send_command(r);
-  // can't fail
-  return 0;
 }
 
-int MonClient::start_mon_command(int rank,
+void MonClient::start_mon_command(int rank,
                                 const vector<string>& cmd,
                                 const bufferlist& inbl,
                                 bufferlist *outbl, string *outs,
@@ -1096,7 +1092,6 @@ int MonClient::start_mon_command(int rank,
   r->onfinish = onfinish;
   mon_commands[r->tid] = r;
   _send_command(r);
-  return 0;
 }
 
 // ---------

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 6a154fc6fce7c339bc9bd38948847d5fe431ea00..bcd6d517a012d687f9e8393cd2f603b3bc756b80 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -439,14 +439,14 @@ private:
   void handle_mon_command_ack(MMonCommandAck *ack);
 
 public:
-  int start_mon_command(const vector<string>& cmd, const bufferlist& inbl,
+  void start_mon_command(const vector<string>& cmd, const bufferlist& inbl,
                        bufferlist *outbl, string *outs,
                        Context *onfinish);
-  int start_mon_command(int mon_rank,
+  void start_mon_command(int mon_rank,
                        const vector<string>& cmd, const bufferlist& inbl,
                        bufferlist *outbl, string *outs,
                        Context *onfinish);
-  int start_mon_command(const string &mon_name,  ///< mon name, with mon. prefix
+  void start_mon_command(const string &mon_name,  ///< mon name, with mon. prefix
                        const vector<string>& cmd, const bufferlist& inbl,
                        bufferlist *outbl, string *outs,
                        Context *onfinish);