From b9edab80f048fee09b82cdd4ec58fa37bd937ded Mon Sep 17 00:00:00 2001
From: Xiubo Li <xiubli@redhat.com>
Date: Fri, 15 Jul 2022 17:13:37 +0800
Subject: [PATCH] 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>
---
 PendingReleaseNotes                   | 4 ++++
 src/client/Client.cc                  | 2 +-
 src/common/options/mds-client.yaml.in | 8 ++++++++
 src/common/options/mds.yaml.in        | 8 --------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index b6a18ff9a9973..97e47148abb82 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -100,6 +100,10 @@
   potentially different from that of the parent image.  The efficient
   copy-on-write semantics intrinsic to unformatted (regular) cloned images
   are retained.
+* 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.1
 
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 4c180ef754da4..428fe83526a74 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4564,7 +4564,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 7f96fa30d2443..4e599d4cfa8a8 100644
--- 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 f22d867cfea25..8d54b851a5180 100644
--- a/src/common/options/mds.yaml.in
+++ b/src/common/options/mds.yaml.in
@@ -1343,14 +1343,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
-- 
2.39.5