client: move a client's option to mds-client.yaml

mds_max_retries_on_remount_failure option is used by Client.cc only.

Fixes: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit b9edab80f048fee09b82cdd4ec58fa37bd937ded)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 452f7c27704556dde67607e039ee47430cf32938..491111ab1b16c1763ee0d548bf995f8e09ff1dc4 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -17,6 +17,10 @@
   namespaces was added to RBD in Nautilus 14.2.0 and it has been possible to
   map and unmap images in namespaces using the `image-spec` syntax since then
   but the corresponding option available in most other commands was missing.
+* 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.
 
 >=17.2.4
 --------

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 6efa96af2cb5ed29c07c23fda5f1b93348524fdf..fab302c0e71b01624c93ecb57ec8c84b0e397b8a 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4515,7 +4515,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/mds-client.yaml.in b/src/common/options/mds-client.yaml.in
index fa9327e5e3a7157587f35fed37772b63b81cdcca..7725901a42db5b5159f1f89c2c6d837863d11dfc 100644 (file)
--- a/src/common/options/mds-client.yaml.in
+++ b/src/common/options/mds-client.yaml.in
@@ -453,6 +453,14 @@ options:
   services:
   - mds_client
   with_legacy: true
+- name: client_max_retries_on_remount_failure
+  type: uint
+  level: advanced
+  desc: number of consecutive failed remount attempts for invalidating kernel dcache
+    after which client would abort.
+  default: 5
+  services:
+  - mds_client
 - name: client_die_on_failed_remount
   type: bool
   level: dev

diff --git a/src/common/options/mds.yaml.in b/src/common/options/mds.yaml.in
index 45a7862f76537d34683a994d4a51f74d0d3c721c..905de50593a964cc64672a27806647cbe0b458b9 100644 (file)
--- a/src/common/options/mds.yaml.in
+++ b/src/common/options/mds.yaml.in
@@ -1324,14 +1324,6 @@ options:
   default: 0
   services:
   - mds
-- name: mds_max_retries_on_remount_failure
-  type: uint
-  level: advanced
-  desc: number of consecutive failed remount attempts for invalidating kernel dcache
-    after which client would abort.
-  default: 5
-  services:
-  - mds
 - name: mds_dump_cache_threshold_formatter
   type: size
   level: dev