From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 17 Sep 2015 15:56:14 +0000 (+0800)
Subject: mds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT
X-Git-Tag: v9.1.0~102^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdb2fa241bfabd2feb29b3ada9c84983c60fdcbc;p=ceph.git

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 6ecee035c8cd..4de25dfe4521 100644
--- 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;