From: Joao Eduardo Luis <joao@suse.de>
Date: Wed, 2 Nov 2016 15:33:52 +0000 (+0000)
Subject: mon: MonmapMonitor: return success when monitor will be removed
X-Git-Tag: v10.2.6~30^2~12^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbdb01cf184c43a6ae5b5cbe45bbbc4f79135de8;p=ceph.git

mon: MonmapMonitor: return success when monitor will be removed

Fixes: http://tracker.ceph.com/issues/17725

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)
---

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index a38f3fe9569..a40f6c19a69 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -467,6 +467,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
     ss << "removing mon." << name << " at " << addr
        << ", there will be " << pending_map.size() << " monitors" ;
     propose = true;
+    err = 0;
     goto reply;
 
   } else {