From bdb2fa241bfabd2feb29b3ada9c84983c60fdcbc Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Thu, 17 Sep 2015 23:56:14 +0800 Subject: [PATCH] mds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT Fixes: #12506 Signed-off-by: Yan, Zheng --- src/mds/MDSDaemon.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.47.3