From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Mar 2019 17:54:43 +0000 (-0600)
Subject: Revert "mon/MonClient: disable ms_bind_msgr2 if NAUTILUS feature not set"
X-Git-Tag: v14.1.1~21^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b21dc7f2b53e2fd00a2ee535e979e50912e5dfa1;p=ceph.git

Revert "mon/MonClient: disable ms_bind_msgr2 if NAUTILUS feature not set"

This reverts commit f3ddb1c9b88067b1a4b54d23d825ca4d62e10586.

That behavior complicated the process of moving to v1 -> v2+v1 (extra
daemon restart, for example).  Also, it wasn't sufficient: there are lots
of other reasons besides the mon version that could lead to a mismatch
between what we bind to locally and what is published in the cluster
maps.  Better to embrace that reality and address those other issues.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index e366805a9fb7..bf4e12407594 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -380,15 +380,6 @@ void MonClient::handle_monmap(MMonMap *m)
   monmap.print(*_dout);
   *_dout << dendl;
 
-  if (monmap.get_epoch() > 0 &&
-      !monmap.get_required_features().contains_all(
-	ceph::features::mon::FEATURE_NAUTILUS) &&
-      cct->_conf.get_val<bool>("ms_bind_msgr2")) {
-    ldout(cct,1) << " disabling ms_bind_msgr2 because monmap does not have"
-		 << " NAUTILUS feature set" << dendl;
-    cct->_conf.set_val("ms_bind_msgr2", "false");
-  }
-
   if (old_name.size() == 0) {
     ldout(cct,10) << " can't identify which mon we were connected to" << dendl;
     _reopen_session();