From: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
Date: Fri, 14 Aug 2020 17:37:56 +0000 (+0800)
Subject: mds: standy-replay mds remained in the "resolve" state after restart the active mds
X-Git-Tag: v16.1.0~1362^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a786d2543cddcd1e4fbb7a574b76c3a30ddbf512;p=ceph.git

mds: standy-replay mds remained in the "resolve" state after restart the active mds

In multimds and standy-replay enabled Ceph cluster，after reduce a filesystem mds num and restart an active mds,
its standy-replay mds didn't enter into active state and remained in the "resolve" state.

Fixes: https://tracker.ceph.com/issues/46976

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 9a0e2a5390ce..36471e86c16a 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1715,8 +1715,6 @@ void MDSRank::replay_start()
   if (is_standby_replay())
     standby_replaying = true;
 
-  calc_recovery_set();
-
   // Check if we need to wait for a newer OSD map before starting
   bool const ready = objecter->with_osdmap(
     [this](const OSDMap& o) {
@@ -1892,6 +1890,8 @@ void MDSRank::resolve_start()
 
   reopen_log();
 
+  calc_recovery_set();
+
   mdcache->resolve_start(new C_MDS_VoidFn(this, &MDSRank::resolve_done));
   finish_contexts(g_ceph_context, waiting_for_resolve);
 }