From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 7 Nov 2019 08:15:07 +0000 (+0800)
Subject: mds: tolerate no snaprealm encoded in on-disk root inode
X-Git-Tag: v15.1.0~659^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=141eddba068dd2dc5afe783c21b4af751306d281;p=ceph.git

mds: tolerate no snaprealm encoded in on-disk root inode

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/42675
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index e3c4ef1e24af..ef00696cee7f 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3018,7 +3018,8 @@ void CInode::decode_snap_blob(const bufferlist& snapbl)
       }
     }
     dout(20) << __func__ << " " << *snaprealm << dendl;
-  } else if (snaprealm) {
+  } else if (snaprealm &&
+	     !is_root() && !is_mdsdir()) { // see https://tracker.ceph.com/issues/42675
     ceph_assert(mdcache->mds->is_any_replay());
     snaprealm->merge_to(NULL);
   }