mon: deprecate CephFS inline_data support

The plan is to start deprecating this feature now so that we can remove
it in a future release. Change it to require the
--yes-i-really-really-mean-it flag, and to emit a custom
warning when that isn't specified.

For now, we leave the testing in place since we do want to be notified
if something breaks before we're ready to rip it out completely.

Fixes: https://tracker.ceph.com/issues/41311
Signed-off-by: Jeff Layton <jlayton@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 5dabadd4d17177d4ae6548bad23ff5ac7b023025..18e12911fd3c6461eb1c598ed84eb6a2b804af4f 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -131,6 +131,12 @@
   New admin command ``ceph daemon osd.# dump_osd_network [threshold]`` will
   do the same but only including heartbeats initiated by the specified OSD.
 
+* Inline data support for CephFS has been deprecated. When setting the flag,
+  users will see a warning to that effect, and enabling it now requires the
+  ``--yes-i-really-really-mean-it`` flag. If the MDS is started on a
+  filesystem that has it enabled, a health warning is generated. Support for
+  this feature will be removed in a future release.
+
 * Following invalid settings now are not tolerated anymore
   for the command `ceph osd erasure-code-profile set xxx`.
   * invalid `m` for "reed_sol_r6_op" erasure technique

diff --git a/doc/cephfs/experimental-features.rst b/doc/cephfs/experimental-features.rst
index d018b262268c2b58dbb6b7e9d1062cc929ac4701..63984c1cd543363c687b24bb358dda00d4b3ac64 100644 (file)
--- a/doc/cephfs/experimental-features.rst
+++ b/doc/cephfs/experimental-features.rst
@@ -23,6 +23,9 @@ failures within it are unlikely to make non-inlined data inaccessible
 Inline data has always been off by default and requires setting
 the ``inline_data`` flag.
 
+Inline data has been declared deprecated for the Octopus release, and will
+likely be removed altogether in the Q release.
+
 Mantle: Programmable Metadata Load Balancer
 -------------------------------------------
 

diff --git a/qa/suites/fs/basic_workload/inline/yes.yaml b/qa/suites/fs/basic_workload/inline/yes.yaml
index da8677a5cdb3c45f4b59a80fa245d08a5b45ebca..8bdd3ebcb513567fbbda61e79d933022b01c8f26 100644 (file)
--- a/qa/suites/fs/basic_workload/inline/yes.yaml
+++ b/qa/suites/fs/basic_workload/inline/yes.yaml
@@ -1,4 +1,4 @@
 tasks:
 - exec:
     client.0:
-      - sudo ceph fs set cephfs inline_data true --yes-i-really-mean-it
+      - sudo ceph fs set cephfs inline_data true --yes-i-really-really-mean-it

diff --git a/qa/suites/kcephfs/cephfs/inline/yes.yaml b/qa/suites/kcephfs/cephfs/inline/yes.yaml
index da8677a5cdb3c45f4b59a80fa245d08a5b45ebca..8bdd3ebcb513567fbbda61e79d933022b01c8f26 100644 (file)
--- a/qa/suites/kcephfs/cephfs/inline/yes.yaml
+++ b/qa/suites/kcephfs/cephfs/inline/yes.yaml
@@ -1,4 +1,4 @@
 tasks:
 - exec:
     client.0:
-      - sudo ceph fs set cephfs inline_data true --yes-i-really-mean-it
+      - sudo ceph fs set cephfs inline_data true --yes-i-really-really-mean-it

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 7dc2f5a891a378e0665ab558cc74677bb5d480da..01ddacc28c2868505247b46f334c6d12191cd41f 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -966,10 +966,10 @@ function test_mon_mds()
   expect_false ceph fs set cephfs max_mds 257
   expect_false ceph fs set cephfs max_mds asdf
   expect_false ceph fs set cephfs inline_data true
-  ceph fs set cephfs inline_data true --yes-i-really-mean-it
-  ceph fs set cephfs inline_data yes --yes-i-really-mean-it
-  ceph fs set cephfs inline_data 1 --yes-i-really-mean-it
-  expect_false ceph fs set cephfs inline_data --yes-i-really-mean-it
+  ceph fs set cephfs inline_data true --yes-i-really-really-mean-it
+  ceph fs set cephfs inline_data yes --yes-i-really-really-mean-it
+  ceph fs set cephfs inline_data 1 --yes-i-really-really-mean-it
+  expect_false ceph fs set cephfs inline_data --yes-i-really-really-mean-it
   ceph fs set cephfs inline_data false
   ceph fs set cephfs inline_data no
   ceph fs set cephfs inline_data 0

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 67eaf543f9b411874adde379566e097d04b1be6a..37ea86e6b87ce537c07f2281068404c101945ace 100644 (file)
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -367,9 +367,10 @@ public:
 
       if (enable_inline) {
         bool confirm = false;
-        cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", confirm);
+        cmd_getval(g_ceph_context, cmdmap, "yes_i_really_really_mean_it", confirm);
        if (!confirm) {
-         ss << EXPERIMENTAL_WARNING;
+         ss << "Inline data support is deprecated and will be removed in a future release. "
+            << "Add --yes-i-really-really-mean-it if you are certain you want this enabled.";
          return -EPERM;
        }
        ss << "inline data enabled";

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 5c0a47c80c5af82f98d01326b7f4978efcae27b3..9530e788bd8cf673377195161187b6bec7a5fb7d 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -424,7 +424,8 @@ COMMAND("fs set " \
         "|standby_count_wanted|session_timeout|session_autoclose" \
         "|allow_standby_replay|down|joinable|min_compat_client " \
        "name=val,type=CephString "                                     \
-       "name=yes_i_really_mean_it,type=CephBool,req=false",                    \
+       "name=yes_i_really_mean_it,type=CephBool,req=false "            \
+       "name=yes_i_really_really_mean_it,type=CephBool,req=false",     \
        "set fs parameter <var> to <val>", "mds", "rw")
 COMMAND("fs flag set name=flag_name,type=CephChoices,strings=enable_multiple "
         "name=val,type=CephString " \