From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 21 Nov 2016 12:27:40 +0000 (+0800)
Subject: mds: fix failed assertion in MDCache::maybe_resolve_finish
X-Git-Tag: v11.1.0~201^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12098%2Fhead;p=ceph.git

mds: fix failed assertion in MDCache::maybe_resolve_finish

It's possible mds's state is RESOLVE and mds's want_state is
RECONNCT or STATE_REJOIN. MDCache::resolve_done is null in that
case.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 06e7520b865b..f327e04e49db 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3317,10 +3317,11 @@ void MDCache::maybe_resolve_finish()
   dout(10) << "maybe_resolve_finish got all resolves+resolve_acks, done." << dendl;
   disambiguate_imports();
   finish_committed_masters();
-  if (mds->is_resolve()) {
+
+  if (resolve_done) {
+    assert(mds->is_resolve());
     trim_unlinked_inodes();
     recalc_auth_bits(false);
-    assert(resolve_done != NULL);
     resolve_done->complete(0);
     resolve_done = NULL;
   } else {