From: Yan, Zheng Date: Tue, 9 Oct 2018 08:42:41 +0000 (+0800) Subject: mds: don't cap log when there are replicated objects X-Git-Tag: v12.2.11~22^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4994a7a0b7e8397f3e887327925dab345f160eef;p=ceph.git mds: don't cap log when there are replicated objects replicas may dirty scatter locks Fixes: http://tracker.ceph.com/issues/36350 Signed-off-by: "Yan, Zheng" (cherry picked from commit 6c1d4c606a9f597196235aa5cd3fa6d98a683290) Conflicts: src/mds/MDCache.cc - maintain auth pin checking mechanism as luminous --- diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index f26f400c4ba..abc7fc9f699 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -7675,6 +7675,12 @@ bool MDCache::shutdown_pass() assert(!migrator->is_exporting()); assert(!migrator->is_importing()); + // replicas may dirty scatter locks + if (myin && myin->is_replicated()) { + dout(7) << "still have replicated objects" << dendl; + return false; + } + if ((myin && myin->is_auth_pinned()) || (mydir && mydir->is_auth_pinned())) { dout(7) << "still have auth pinned objects" << dendl;