From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 17 Aug 2020 04:55:22 +0000 (+0800)
Subject: mds: don't track change of config 'mds_replay_unsafe_with_closed_session'
X-Git-Tag: v15.2.9~122^2~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78d116c7d4d476184807fd533f7dd736557f2607;p=ceph.git

mds: don't track change of config 'mds_replay_unsafe_with_closed_session'

the option is only used when mds is recovering.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 3a8e22527357da1c5b701a22915288e398e7b93c)

Conflicts:
	src/mds/MDSRank.cc
- octopus does not have "mds_heartbeat_grace" in
  MDSRankDispatcher::get_tracked_conf_keys KEYS array
---

diff --git a/src/common/options.cc b/src/common/options.cc
index f76a6231494..71cdcd7f3c9 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7831,7 +7831,7 @@ std::vector<Option> get_mds_options() {
 
     Option("mds_replay_unsafe_with_closed_session", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
-    .set_flag(Option::FLAG_RUNTIME)
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("complete all the replay request when mds is restarted, no matter the session is closed or not"),
 
     Option("mds_default_dir_hash", Option::TYPE_INT, Option::LEVEL_ADVANCED)
diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index e7ebee467e7..41621585df7 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -3577,7 +3577,6 @@ const char** MDSRankDispatcher::get_tracked_conf_keys() const
     "mds_recall_warning_decay_rate",
     "mds_request_load_average_decay_rate",
     "mds_session_cache_liveness_decay_rate",
-    "mds_replay_unsafe_with_closed_session",
     NULL
   };
   return KEYS;
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index ed06fe22b5f..1857583af04 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1158,9 +1158,6 @@ void Server::handle_conf_change(const std::set<std::string>& changed) {
   if (changed.count("mds_forward_all_requests_to_auth")){
     forward_all_requests_to_auth = g_conf().get_val<bool>("mds_forward_all_requests_to_auth");
   }
-  if (changed.count("mds_replay_unsafe_with_closed_session")) {
-    replay_unsafe_with_closed_session = g_conf().get_val<bool>("mds_replay_unsafe_with_closed_session");
-  }
   if (changed.count("mds_cap_revoke_eviction_timeout")) {
     cap_revoke_eviction_timeout = g_conf().get_val<double>("mds_cap_revoke_eviction_timeout");
     dout(20) << __func__ << " cap revoke eviction timeout changed to "