mds: remove MonClient reconnect

We should instead rely on the keepalives and automatic reconnects by the
MonClient.

Fixes: http://tracker.ceph.com/issues/36493
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index 52c9a9bb71b225f3e675b434e222292462c7515d..e2679b4350d68bbfc29be916769d259838066153 100644 (file)
--- a/src/mds/Beacon.cc
+++ b/src/mds/Beacon.cc
@@ -260,14 +260,6 @@ bool Beacon::is_laggy()
              << "s since last acked beacon" << dendl;
     }
     laggy = true;
-    auto last_reconnect = std::chrono::duration<double>(now-last_mon_reconnect).count();
-    if (since > (g_conf()->mds_beacon_grace*2) && last_reconnect > g_conf()->mds_beacon_interval) {
-      // maybe it's not us?
-      dout(1) << "initiating monitor reconnect; maybe we're not the slow one"
-              << dendl;
-      last_mon_reconnect = now;
-      monc->reopen_session();
-    }
     return true;
   }
   return false;

diff --git a/src/mds/Beacon.h b/src/mds/Beacon.h
index f01fba2a1ee5aa1fd154f2ee2153a13e16ff416e..768ef556bd46f146b4fbfd73e7e9d7740937a99e 100644 (file)
--- a/src/mds/Beacon.h
+++ b/src/mds/Beacon.h
@@ -108,7 +108,6 @@ private:
   version_t last_seq = 0; // last seq sent to monitor
   std::map<version_t,time>  seq_stamp;    // seq # -> time sent
   time last_acked_stamp = clock::zero();  // last time we sent a beacon that got acked
-  time last_mon_reconnect = clock::zero();
   bool laggy = false;
   time last_laggy = clock::zero();