mds: strengthen assertions in rejoin ack

The ACK only contains items we asked for with a WEAK request.  Assert as
much.  (The old continue bits were from ~2007, when this was originally
written.)

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index c089aac7b4ed33abc45bb5cdfc9b8b3567c14daa..51bd56c4e728ce5a7eb4a7b2a5143816e82037c4 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3854,7 +3854,7 @@ void MDCache::handle_cache_rejoin_ack(MMDSCacheRejoin *ack)
        p != ack->strong_dirfrags.end();
        ++p) {
     CDir *dir = get_dirfrag(p->first);
-    if (!dir) continue;  // must have trimmed?
+    assert(dir);
 
     dir->set_replica_nonce(p->second.nonce);
     dir->state_clear(CDir::STATE_REJOINING);
@@ -3866,7 +3866,7 @@ void MDCache::handle_cache_rejoin_ack(MMDSCacheRejoin *ack)
         q != dmap.end();
         ++q) {
       CDentry *dn = dir->lookup(q->first.name, q->first.snapid);
-      if (!dn) continue;  // must have trimmed?
+      assert(dn);
       CDentry::linkage_t *dnl = dn->get_linkage();
 
       assert(dn->last == q->first.snapid);
@@ -3919,7 +3919,7 @@ void MDCache::handle_cache_rejoin_ack(MMDSCacheRejoin *ack)
     ::decode(last, p);
     ::decode(basebl, p);
     CInode *in = get_inode(ino, last);
-    if (!in) continue;
+    assert(in);
     bufferlist::iterator q = basebl.begin();
     in->_decode_base(q);
     dout(10) << " got inode base " << *in << dendl;
@@ -3940,7 +3940,7 @@ void MDCache::handle_cache_rejoin_ack(MMDSCacheRejoin *ack)
     ::decode(lockbl, p);
     
     CInode *in = get_inode(ino, last);
-    if (!in) continue;
+    assert(in);
     in->set_replica_nonce(nonce);
     bufferlist::iterator q = lockbl.begin();
     in->_decode_locks_rejoin(q, rejoin_waiters);