]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Avoid the assert failure when the inode for the cap_export from other MDS happened... 20300/head
authorJianyu Li <joannyli@foxmail.com>
Thu, 4 Jan 2018 16:54:30 +0000 (00:54 +0800)
committerPrashant D <pdhange@redhat.com>
Mon, 5 Feb 2018 00:09:22 +0000 (19:09 -0500)
Signed-off-by: Jianyu Li <joannyli@tencent.com>
(cherry picked from commit 82b9b838ae0bd17247f6296f9d7001331f50663c)

src/mds/MDCache.cc

index 298799f0d9529688cb3164a69bd0f270f732abf5..60045cb1600d5f6ad3ed8e6d93fe36cc6d4f2a0e 100644 (file)
@@ -4322,7 +4322,7 @@ void MDCache::handle_cache_rejoin_weak(MMDSCacheRejoin *weak)
 
     for (auto p = weak->cap_exports.begin(); p != weak->cap_exports.end(); ++p) {
       CInode *in = get_inode(p->first);
-      assert(in && in->is_auth());
+      assert(!in || in->is_auth());
       // note
       for (auto q = p->second.begin(); q != p->second.end(); ++q) {
        dout(10) << " claiming cap import " << p->first << " client." << q->first << dendl;