RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #31455 into master

Browse Source 
* refs/pull/31455/head:
	mds: tolerate no snaprealm encoded in on-disk root inode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-12-04 14:17:40 -08:00
commit 2c67530766
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mds/CInode.cc
View File

@ -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);
}