Merge pull request #11999: jewel: Error EINVAL: removing mon.a at 172…

….21.15.16:6789/0, there will be 1 monitors Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Nov 23, 2016 · 34d42ad · 34d42ad
2 parents 64540a1 + 33b8893
commit 34d42ad
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
@@ -414,7 +414,6 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
     ss << "adding mon." << name << " at " << addr;
     propose = true;
     dout(0) << __func__ << " proposing new mon." << name << dendl;
-    goto reply;
 
   } else if (prefix == "mon remove" ||
              prefix == "mon rm") {
@@ -467,7 +466,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
     ss << "removing mon." << name << " at " << addr
        << ", there will be " << pending_map.size() << " monitors" ;
     propose = true;
-    goto reply;
+    err = 0;
 
   } else {
     ss << "unknown command " << prefix;