From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 17 Dec 2018 16:34:00 +0000 (-0800)
Subject: mds: create heartbeat grace config option
X-Git-Tag: v12.2.11~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=361a3d60b79d9bb0ca67cf8d40763ae8b3b8a90c;p=ceph.git

mds: create heartbeat grace config option

Currently the MDS uses the mds_beacon_grace for the heartbeat timeout. If we
need to increase the beacon grace because the MDS is missing beacon replies for
some reason, we still want to see the warnings when the MDS is missing
heartbeats.

Fixes: http://tracker.ceph.com/issues/37674
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 5c143f3039c1967ca83d8a0cce35bf2a12509aef)

Conflicts:
	src/mds/MDSRank.cc : Resolved in heartbeat_reset
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 05eb0cbef99..b8adae94187 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6110,6 +6110,10 @@ std::vector<Option> get_mds_options() {
     .set_default(15)
     .set_description(""),
 
+    Option("mds_heartbeat_grace", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
+    .set_default(15)
+    .set_description("tolerance in seconds for MDS internal heartbeat"),
+
     Option("mds_enforce_unique_name", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description(""),
diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index b74a8db9166..6b3666bb940 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1205,7 +1205,8 @@ void MDSRank::heartbeat_reset()
   // NB not enabling suicide grace, because the mon takes care of killing us
   // (by blacklisting us) when we fail to send beacons, and it's simpler to
   // only have one way of dying.
-  g_ceph_context->get_heartbeat_map()->reset_timeout(hb, g_conf->mds_beacon_grace, 0);
+  auto grace = g_conf->get_val<double>("mds_heartbeat_grace");
+  g_ceph_context->get_heartbeat_map()->reset_timeout(hb, grace, 0);
 }
 
 bool MDSRank::is_stale_message(Message *m) const