mds: verified slave failure is tolerated. fixed remote_auth_pin rejoin bug.

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index cf82ad3a5dd55a82e9b21ba146c13cbcac7a8f5f..c8daddb4302bf8c2a1ea381f369f73365c45742d 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1734,13 +1734,13 @@ void MDCache::rejoin_send_rejoins()
 
   if (!mds->is_rejoin()) {
     // i am survivor.  send strong rejoin.
-    // note request authpins, xlocks
+    // note request remote_auth_pins, xlocks
     for (hash_map<metareqid_t, MDRequest*>::iterator p = active_requests.begin();
         p != active_requests.end();
         ++p) {
       // auth pins
-      for (set<MDSCacheObject*>::iterator q = p->second->auth_pins.begin();
-          q != p->second->auth_pins.end();
+      for (set<MDSCacheObject*>::iterator q = p->second->remote_auth_pins.begin();
+          q != p->second->remote_auth_pins.end();
           ++q) {
        if (!(*q)->is_auth()) {
          int who = (*q)->authority().first;

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 6c756c77a536e992093480da01ca6ef5f1b693d2..14d730aa41574fc82fc5eac9ea08b422822ebcc8 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2303,7 +2303,7 @@ void Server::_link_remote(MDRequest *mdr, CDentry *dn, CInode *targeti)
   }
   dout(10) << " targeti auth has prepared nlink++" << dendl;
 
-  assert(0);  // test hack: verify that remote slave can do a live rollback.
+  //assert(0);  // test hack: verify that remote slave can do a live rollback.
 
   // go.
   // predirty dentry
@@ -2376,6 +2376,8 @@ void Server::handle_slave_link_prep(MDRequest *mdr)
 
   mdr->auth_pin(targeti);
 
+  //assert(0);  // test hack: make sure master can handle a slave that fails to prepare...
+
   // anchor?
   if (mdr->slave_request->get_op() == MMDSSlaveRequest::OP_LINKPREP) {
     if (targeti->is_anchored()) {