mds: fix the description for inotable testing only options

The description text are mixed for mds_kill_skip_replaying_inotable
and mds_inject_skip_replaying_inotable.

At the same time rename "mds_kill_skip_replaying_inotable", which
is a bit confusing to "mds_kill_after_journal_logs_flushed".

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 5778898c6df065adb382fe58b3532153ddc1cd9d..f4319639215f58a511d657ff0c81ca2983b7a4cc 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -349,11 +349,20 @@ CephFS: Disallow delegating preallocated inode ranges to clients. Config
   than the number mentioned against the config tunable `mds_max_snaps_per_dir`
   so that a new snapshot can be created and retained during the next schedule
   run.
+* cephfs: Running the command "ceph fs authorize" for an existing entity now
+  upgrades the entity's capabilities instead of printing an error. It can now
+  also change read/write permissions in a capability that the entity already
+  holds. If the capability passed by user is same as one of the capabilities
+  that the entity already holds, idempotency is maintained.
 * `ceph config dump --format <json|xml>` output will display the localized
   option names instead of its normalized version. For e.g.,
   "mgr/prometheus/x/server_port" will be displayed instead of
   "mgr/prometheus/server_port". This matches the output of the non pretty-print
   formatted version of the command.
+* CEPHFS: MDS config option name "mds_kill_skip_replaying_inotable" is a bit
+  confusing with "mds_inject_skip_replaying_inotable", therefore renaming it to
+  "mds_kill_after_journal_logs_flushed"
+
 
 >=17.2.1
 

diff --git a/doc/cephfs/mds-config-ref.rst b/doc/cephfs/mds-config-ref.rst
index e578b7f251489c02b82ef336867317e9d8480b01..9176a739801e3665a7ac8950e19bbee71c8ca588 100644 (file)
--- a/doc/cephfs/mds-config-ref.rst
+++ b/doc/cephfs/mds-config-ref.rst
@@ -57,7 +57,7 @@
 .. confval:: mds_kill_link_at
 .. confval:: mds_kill_rename_at
 .. confval:: mds_inject_skip_replaying_inotable
-.. confval:: mds_kill_skip_replaying_inotable
+.. confval:: mds_kill_after_journal_logs_flushed
 .. confval:: mds_wipe_sessions
 .. confval:: mds_wipe_ino_prealloc
 .. confval:: mds_skip_ino

diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py
index 72468a81361ae6a4c6afb80b648db9eb271b1f1e..a6a6bb74e642c27f450d56a6156656478f15537a 100644 (file)
--- a/qa/tasks/cephfs/test_misc.py
+++ b/qa/tasks/cephfs/test_misc.py
@@ -632,7 +632,7 @@ class TestSkipReplayInoTable(CephFSTestCase):
         status = self.fs.status()
         rank0 = self.fs.get_rank(rank=0, status=status)
 
-        self.fs.mds_asok(['config', 'set', 'mds_kill_skip_replaying_inotable', "true"])
+        self.fs.mds_asok(['config', 'set', 'mds_kill_after_journal_logs_flushed', "true"])
         # This will make the MDS crash, since we only have one MDS in the
         # cluster and without the "wait=False" it will stuck here forever.
         self.mount_a.run_shell(["mkdir", "test_alloc_ino/dir1"], wait=False)

diff --git a/src/common/options/mds.yaml.in b/src/common/options/mds.yaml.in
index e8116f275237ba6ef4852cc4205a59623c1d77c6..0dc0b63faf2a0bf471165bbd4ee02c1e535dae48 100644 (file)
--- a/src/common/options/mds.yaml.in
+++ b/src/common/options/mds.yaml.in
@@ -1172,14 +1172,14 @@ options:
   default: false
   services:
   - mds
-- name: mds_kill_skip_replaying_inotable
+- name: mds_kill_after_journal_logs_flushed
   type: bool
   level: dev
   default: false
   services:
   - mds
-  fmt_desc: Ceph will skip replaying the inotable when replaying the journal, and
-    the premary MDS will crash, while the replacing MDS won't.
+  fmt_desc: The primary MDS will crash just after the mknod/openc journal logs
+    are flushed to the pool.
     (for testing only).
   with_legacy: true
 - name: mds_inject_skip_replaying_inotable
@@ -1188,8 +1188,7 @@ options:
   default: false
   services:
   - mds
-  fmt_desc: Ceph will skip replaying the inotable when replaying the journal, and
-    the premary MDS will crash, while the replacing MDS won't.
+  fmt_desc: MDS will skip replaying the inotable when replaying the journal logs.
     (for testing only).
   with_legacy: true
 #  percentage of MDS modify replies to skip sending the client a trace on [0-1]

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 0bb30664ac5f669847d4f8cc587604a13d8dfe2e..53fb7159f3c84e5b5569024815fe347629b9fd6e 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -4611,7 +4611,7 @@ public:
     ceph_assert(r == 0);
 
     // crash current MDS and the replacing MDS will test the journal
-    ceph_assert(!g_conf()->mds_kill_skip_replaying_inotable);
+    ceph_assert(!g_conf()->mds_kill_after_journal_logs_flushed);
 
     dn->pop_projected_linkage();
 
@@ -6977,7 +6977,7 @@ public:
     ceph_assert(r == 0);
 
     // crash current MDS and the replacing MDS will test the journal
-    ceph_assert(!g_conf()->mds_kill_skip_replaying_inotable);
+    ceph_assert(!g_conf()->mds_kill_after_journal_logs_flushed);
 
     // link the inode
     dn->pop_projected_linkage();
@@ -7274,7 +7274,7 @@ void Server::handle_client_symlink(const MDRequestRef& mdr)
   mds->balancer->maybe_fragment(dir, false);
 
   // flush the journal as soon as possible
-  if (g_conf()->mds_kill_skip_replaying_inotable) {
+  if (g_conf()->mds_kill_after_journal_logs_flushed) {
     mdlog->flush();
   }
 }