From: Xiubo Li <xiubli@redhat.com>
Date: Fri, 10 Mar 2023 05:46:27 +0000 (+0800)
Subject: client: rename mds_max_retries_on_remount_failure to client_
X-Git-Tag: v16.2.13~117^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13404cdeda7c92f28b130560531e3f69f1926612;p=ceph.git

client: rename mds_max_retries_on_remount_failure to client_

mds_max_retries_on_remount_failure option is used by Client.cc only.

Fixed: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit b9edab80f048fee09b82cdd4ec58fa37bd937ded)
Conflicts:
- The options are still old style in pacific
---

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index ea3a21e5d3c4..f5af91d7d1ac 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -32,6 +32,11 @@
   in certain recovery scenarios, e.g., monitor database lost and rebuilt, and
   the restored file system is expected to have the same ID as before.
 
+* CEPHFS: Rename the `mds_max_retries_on_remount_failure` option to
+  `client_max_retries_on_remount_failure` and move it from mds.yaml.in to
+  mds-client.yaml.in because this option was only used by MDS client from its
+  birth.
+
 >=16.2.11
 --------
 
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 811cfa8ec087..3139dc96227c 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4523,7 +4523,7 @@ void Client::remove_session_caps(MetaSession *s, int err)
 
 std::pair<int, bool> Client::_do_remount(bool retry_on_error)
 {
-  uint64_t max_retries = cct->_conf.get_val<uint64_t>("mds_max_retries_on_remount_failure");
+  uint64_t max_retries = cct->_conf.get_val<uint64_t>("client_max_retries_on_remount_failure");
   bool abort_on_failure = false;
 
   errno = 0;
diff --git a/src/common/options.cc b/src/common/options.cc
index b0239e24aa4d..b6481d1f4356 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -8876,10 +8876,6 @@ std::vector<Option> get_mds_options() {
      .set_default(0)
      .set_description("number of seconds after which clients which have not responded to cap revoke messages by the MDS are evicted."),
 
-    Option("mds_max_retries_on_remount_failure", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-     .set_default(5)
-     .set_description("number of consecutive failed remount attempts for invalidating kernel dcache after which client would abort."),
-
     Option("mds_dump_cache_threshold_formatter", Option::TYPE_SIZE, Option::LEVEL_DEV)
      .set_default(1_G)
      .set_description("threshold for cache usage to disallow \"dump cache\" operation to formatter")
@@ -9094,6 +9090,10 @@ std::vector<Option> get_mds_client_options() {
     .set_default(false)
     .set_description(""),
 
+    Option("client_max_retries_on_remount_failure", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+     .set_default(5)
+     .set_description("number of consecutive failed remount attempts for invalidating kernel dcache after which client would abort."),
+
     // note: the max amount of "in flight" dirty data is roughly (max - target)
     Option("fuse_use_invalidate_cb", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)