]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mdsmap: fix find_standby_for
authorSage Weil <sage@newdream.net>
Fri, 13 Mar 2009 22:32:25 +0000 (15:32 -0700)
committerSage Weil <sage@newdream.net>
Fri, 13 Mar 2009 22:32:25 +0000 (15:32 -0700)
Ignore active mds' with old standby_for values.

src/mds/MDSMap.h

index 5686c1c75f068ed7b8ab65a5e02f9cc0ecaa11b9..f51f1b60353e8d4677db39cdcc7fb341f7d1ad8c 100644 (file)
@@ -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()) {