Merge pull request #12006 from SUSE/wip-17905-hammer

hammer: mon: MonmapMonitor should return success when MON will be removed Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Nov 21, 2016 · 708c549 · 708c549
2 parents f776699 + 0ac7f2f
commit 708c549
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
@@ -373,6 +373,7 @@ bool MonmapMonitor::prepare_command(MMonCommand *m)
     pending_map.remove(name);
     pending_map.last_changed = ceph_clock_now(g_ceph_context);
     ss << "removed mon." << name << " at " << addr << ", there are now " << pending_map.size() << " monitors" ;
+    err = 0;
     getline(ss, rs);
     // send reply immediately in case we get removed
     mon->reply_command(m, 0, rs, get_last_committed());