From fb8b027969538c0c475fc146338623dfdb3c8916 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zyan@redhat.com>
Date: Mon, 21 Nov 2016 20:27:40 +0800
Subject: [PATCH] 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>
---
 src/mds/MDCache.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 06e7520b865bc..f327e04e49db6 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 {
-- 
2.39.5