From: Sage Weil <sage@newdream.net>
Date: Tue, 18 Jan 2011 23:13:07 +0000 (-0800)
Subject: mon: remove rank from failed when taking over for failed node
X-Git-Tag: v0.24.2~22
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6152f5227d1ab177230211b6d25e62d6094e26e6;p=ceph.git

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 996baeb65ea62..7c9e3c9ec6bd2 100644
--- 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;
       }
     }