From acd7041cf51caa6c9da12331b0111b4fc80cc783 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 13 Mar 2009 15:32:25 -0700
Subject: [PATCH] mdsmap: fix find_standby_for

Ignore active mds' with old standby_for values.
---
 src/mds/MDSMap.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 5686c1c75f068..f51f1b60353e8 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -243,7 +243,8 @@ class MDSMap {
     for (map<entity_addr_t,mds_info_t>::const_iterator p = mds_info.begin();
 	 p != mds_info.end();
 	 p++) {
-      if ((p->second.standby_for_rank == mds ||
+      if (p->second.rank == -1 &&
+	  (p->second.standby_for_rank == mds ||
 	   p->second.standby_for_name == name) &&
 	  p->second.state == MDSMap::STATE_STANDBY &&
 	  !p->second.laggy()) {
-- 
2.39.5