mds: remove unused MMDSCacheRejoin::{MISSING,FULL}

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index fa28bb919ae9c9248a7cdc9aec0727bb451d645a..233a53dc60a74bd9ee0100886f9a4e5c1cef566c 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3926,17 +3926,9 @@ void MDCache::handle_cache_rejoin(MMDSCacheRejoin *m)
   case MMDSCacheRejoin::OP_STRONG:
     handle_cache_rejoin_strong(m);
     break;
-
   case MMDSCacheRejoin::OP_ACK:
     handle_cache_rejoin_ack(m);
     break;
-  case MMDSCacheRejoin::OP_MISSING:
-    handle_cache_rejoin_missing(m);
-    break;
-
-  case MMDSCacheRejoin::OP_FULL:
-    handle_cache_rejoin_full(m);
-    break;
 
   default: 
     assert(0);
@@ -4928,90 +4920,6 @@ void MDCache::handle_cache_rejoin_ack(MMDSCacheRejoin *ack)
   }
 }
 
-
-
-/* This functions DOES NOT put the passed message before returning */
-void MDCache::handle_cache_rejoin_missing(MMDSCacheRejoin *missing)
-{
-  dout(7) << "handle_cache_rejoin_missing from " << missing->get_source() << dendl;
-
-  MMDSCacheRejoin *full = new MMDSCacheRejoin(MMDSCacheRejoin::OP_FULL);
-
-  // dirs
-  for (map<dirfrag_t, MMDSCacheRejoin::dirfrag_strong>::iterator p = missing->strong_dirfrags.begin();
-       p != missing->strong_dirfrags.end();
-       ++p) {
-    // we may have had incorrect dir fragmentation; refragment based
-    // on what they auth tells us.
-    CDir *dir = get_force_dirfrag(p->first, false);
-    assert(dir);
-
-    dir->set_replica_nonce(p->second.nonce);
-    dir->state_clear(CDir::STATE_REJOINING);
-    dout(10) << " adjusted frag on " << *dir << dendl;
-  }
-
-  // inodes
-  for (set<vinodeno_t>::iterator p = missing->weak_inodes.begin();
-       p != missing->weak_inodes.end();
-       ++p) {
-    CInode *in = get_inode(*p);
-    if (!in) {
-      dout(10) << " don't have inode " << *p << dendl;
-      continue; // we must have trimmed it after the originalo rejoin
-    }
-    
-    dout(10) << " sending " << *in << dendl;
-    full->add_inode_base(in);
-  }
-
-  mds->send_message(full, missing->get_connection());
-}
-
-/* This function DOES NOT put the passed message before returning */
-void MDCache::handle_cache_rejoin_full(MMDSCacheRejoin *full)
-{
-  dout(7) << "handle_cache_rejoin_full from " << full->get_source() << dendl;
-  int from = full->get_source().num();
-  
-  // integrate full inodes
-  bufferlist::iterator p = full->inode_base.begin();
-  while (!p.end()) {
-    inodeno_t ino;
-    snapid_t last;
-    bufferlist basebl;
-    ::decode(ino, p);
-    ::decode(last, p);
-    ::decode(basebl, p);
-
-    CInode *in = get_inode(ino);
-    assert(in);
-    bufferlist::iterator pp = basebl.begin();
-    in->_decode_base(pp);
-
-    set<CInode*>::iterator q = rejoin_undef_inodes.find(in);
-    if (q != rejoin_undef_inodes.end()) {
-      CInode *in = *q;
-      in->state_clear(CInode::STATE_REJOINUNDEF);
-      dout(10) << " got full " << *in << dendl;
-      rejoin_undef_inodes.erase(q);
-    } else {
-      dout(10) << " had full " << *in << dendl;
-    }
-  }
-
-  // done?
-  assert(rejoin_gather.count(from));
-  rejoin_gather.erase(from);
-  if (rejoin_gather.empty()) {
-    rejoin_gather_finish();
-  } else {
-    dout(7) << "still need rejoin from (" << rejoin_gather << ")" << dendl;
-  }
-}
-
-
-
 /**
  * rejoin_trim_undef_inodes() -- remove REJOINUNDEF flagged inodes
  *
@@ -5089,7 +4997,6 @@ void MDCache::rejoin_gather_finish()
   rejoin_ack_gather.erase(mds->whoami);
 
   // did we already get our acks too?
-  // this happens when the rejoin_gather has to wait on a MISSING/FULL exchange.
   if (rejoin_ack_gather.empty()) {
     // finally, kickstart past snap parent opens
     open_snap_parents();

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index c49448c6a15a97f42ea8a654f2a45c06efae7d8b..77e7cd4a54599d7cbf9ce7a6add039da80a2a071 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -439,9 +439,6 @@ protected:
                                      set<vinodeno_t>& acked_inodes,
                                      set<SimpleLock *>& gather_locks);
   void handle_cache_rejoin_ack(MMDSCacheRejoin *m);
-  void handle_cache_rejoin_purge(MMDSCacheRejoin *m);
-  void handle_cache_rejoin_missing(MMDSCacheRejoin *m);
-  void handle_cache_rejoin_full(MMDSCacheRejoin *m);
   void rejoin_send_acks();
   void rejoin_trim_undef_inodes();
   void maybe_send_pending_rejoins() {

diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index bbafe64a35a7eacf7e79649bbe3b8c9f8404dce5..979fe9a49abdc129f81a56629cb4713e3e6b5448 100644 (file)
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -33,15 +33,11 @@ class MMDSCacheRejoin : public Message {
   static const int OP_WEAK    = 1;  // replica -> auth, i exist, + maybe open files.
   static const int OP_STRONG  = 2;  // replica -> auth, i exist, + open files and lock state.
   static const int OP_ACK     = 3;  // auth -> replica, here is your lock state.
-  static const int OP_MISSING = 5;  // auth -> replica, i am missing these items
-  static const int OP_FULL    = 6;  // replica -> auth, here is the full object.
   static const char *get_opname(int op) {
     switch (op) {
     case OP_WEAK: return "weak";
     case OP_STRONG: return "strong";
     case OP_ACK: return "ack";
-    case OP_MISSING: return "missing";
-    case OP_FULL: return "full";
     default: assert(0); return 0;
     }
   }