mds: fix resolve stage

This was recently broken by b818f5b.
matutter · Mar 18, 2010 · d1c1744 · d1c1744
1 parent 965d737
commit d1c1744
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/TODO b/src/TODO
@@ -42,8 +42,8 @@ v0.19
 - debian: packaging fixes
 
 v0.20
-
 - new filestore, journaling
+
 - multiple mds fixes
 
 - qa: snap test.  maybe walk through 2.6.* kernel trees?
@@ -60,8 +60,6 @@ filestore
   - need an osdmap cache layer?
 
 bugs
-- mds: resolve problems.  restart all 3 mds's a few times (after vstart + a partial untar) and they won't come back up.
-
 - kclient: looping osd connection failures
 [ 3974.417106] ceph: osd11 10.3.14.138:6800 connection failed
 [ 3974.423295] ceph: osd11 10.3.14.138:6800 connection failed

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
@@ -2011,14 +2011,7 @@ void MDCache::resolve_start()
       adjust_subtree_auth(rootdir, CDIR_AUTH_UNKNOWN);
   }
 
-  /*set<int> who;
-  mds->mdsmap->get_mds_set(who, MDSMap::STATE_RESOLVE);
-  mds->mdsmap->get_mds_set(who, MDSMap::STATE_REJOIN);
-  mds->mdsmap->get_mds_set(who, MDSMap::STATE_CLIENTREPLAY);
-  mds->mdsmap->get_mds_set(who, MDSMap::STATE_ACTIVE);
-  mds->mdsmap->get_mds_set(who, MDSMap::STATE_STOPPING);
-  */
-  for (set<int>::iterator p = wants_resolve.begin(); p != wants_resolve.end(); ++p) {
+  for (set<int>::iterator p = recovery_set.begin(); p != recovery_set.end(); ++p) {
     if (*p == mds->whoami)
       continue;
     send_resolve(*p);  // now.