mds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT

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

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index 6ecee035c8cd0af1b842d6c0f0c7f8d5a6b70a8c..4de25dfe4521201427c20c6ec3a29a914a660eeb 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -473,12 +473,13 @@ int MDSDaemon::init(MDSMap::DaemonState wanted_state)
       suicide();
     }
     standby_type = wanted_state;
+    wanted_state = MDSMap::STATE_BOOT;
   }
 
   standby_for_rank = mds_rank_t(g_conf->mds_standby_for_rank);
   standby_for_name.assign(g_conf->mds_standby_for_name);
 
-  if (wanted_state == MDSMap::STATE_STANDBY_REPLAY &&
+  if (standby_type == MDSMap::STATE_STANDBY_REPLAY &&
       standby_for_rank == -1) {
     if (standby_for_name.empty())
       standby_for_rank = MDSMap::MDS_STANDBY_ANY;