include full inode in all acks (even to survivors)

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1531 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/mds/MDCache.cc b/trunk/ceph/mds/MDCache.cc
index 028a7f7baa799eaba83b2a588f08a81d77f93afd..71039fc4cdef8938a6eb1ebd39c424a561c21562 100644 (file)
--- a/trunk/ceph/mds/MDCache.cc
+++ b/trunk/ceph/mds/MDCache.cc
@@ -2597,13 +2597,10 @@ void MDCache::rejoin_send_acks()
   
   // send acks to everyone in the recovery set
   map<int,MMDSCacheRejoin*> ack;
-  set<int> weak;
   for (set<int>::iterator p = recovery_set.begin();
        p != recovery_set.end();
-       ++p) {
+       ++p) 
     ack[*p] = new MMDSCacheRejoin(MMDSCacheRejoin::OP_ACK);
-    if (mds->mdsmap->is_rejoin(*p)) weak.insert(*p);
-  }
   
   // walk subtrees
   for (map<CDir*,set<CDir*> >::iterator p = subtrees.begin(); 
@@ -2650,8 +2647,7 @@ void MDCache::rejoin_send_acks()
        for (map<int,int>::iterator r = in->replicas_begin();
             r != in->replicas_end();
             ++r) {
-         if (weak.count(r->first))
-           ack[r->first]->add_full_inode(in->inode, in->symlink, in->dirfragtree);
+         ack[r->first]->add_full_inode(in->inode, in->symlink, in->dirfragtree);
          ack[r->first]->add_strong_inode(in->ino(), r->second, 0,
                                          in->authlock.get_replica_state(),
                                          in->linklock.get_replica_state(),