mon: remove rank from failed when taking over for failed node

Leaving it there leaves a broken MDSMap, and prevents rejoin because
MDSMap::is_rejoining() is always false.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 996baeb65ea628488b3ef96c47379eb2d15452f6..7c9e3c9ec6bd2c2bb320e63cf04044ec02dd7d31 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -921,6 +921,7 @@ void MDSMonitor::tick()
        si.inc = ++pending_mdsmap.inc[f];
        pending_mdsmap.in.insert(f);
        pending_mdsmap.up[f] = sgid;
+       pending_mdsmap.failed.erase(f);
        do_propose = true;
       }
     }