From c385178b0c04d09bc6774acf5bdb4537fa6803ad Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 6 Nov 2019 00:26:51 -0800 Subject: [PATCH] mds: do not try to diagnose cause of MDSMap removal The Monitors send an empty MDSMap to an MDS it is removing. The MDS can't diagnose the cause. Instead suggest looking at the cluster/monitor logs. Signed-off-by: Patrick Donnelly --- src/mds/MDSDaemon.cc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index 6e32a588d5bc3..6e65323ce0273 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -794,25 +794,8 @@ void MDSDaemon::handle_mds_map(const cref_t &m) using DS = MDSMap::DaemonState; if (old_state != DS::STATE_NULL && new_state == DS::STATE_NULL) { const auto& oldinfo = oldmap->get_info_gid(mygid); - const auto existing = mdsmap->find_mds_gid_by_name(name); - if (g_conf()->mds_enforce_unique_name && existing != MDS_GID_NONE) { - const auto& info = mdsmap->get_info_gid(existing); - dout(1) << "Map replaced me " << oldinfo - << " with another MDS of the same name: " << info - << "; quitting!" << dendl; - - /* Monitors should never go backwards! */ - ceph_assert(info.global_id > myid); - - // Call suicide() rather than respawn() because if someone else has - // taken our ID, we don't want to keep restarting and fighting them for - // the ID. - suicide(); - return; - } - dout(1) << "Map removed me " << oldinfo - << " from cluster due to lost contact; respawning" << dendl; + << " from cluster; respawning! See cluster/monitor logs for details." << dendl; respawn(); } -- 2.39.5