mon/OSDMonitor: expose require_kraken_osds flag to user

For newly created cluster the CEPH_OSDMAP_REQUIRE_KRAKEN will be
automatically set, while for existing clusters it will not.

This change add "require_jewel_osds" to white list, so user
can access it by the "ceph osd set *" command family.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index d9875a7cfa3dc8a733e2ec5736d8015158c5833c..d97a929ad2307ec1483104945c82678864f1f839 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1109,6 +1109,8 @@ function test_mon_osd()
   expect_false ceph osd unset bogus
   ceph osd set require_jewel_osds
   expect_false ceph osd unset require_jewel_osds
+  ceph osd set require_kraken_osds
+  expect_false ceph osd unset require_kraken_osds
 
   ceph osd set noup
   ceph osd down 0

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 1c1da710cbc607496880d49b66daf97faa482cc5..5dc1eed785c86d37d44359b37a9266bb30a61084 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -628,7 +628,7 @@ COMMAND("osd erasure-code-profile ls", \
        "list all erasure code profiles", \
        "osd", "r", "cli,rest")
 COMMAND("osd set " \
-       "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds", \
+       "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds", \
        "set <key>", "osd", "rw", "cli,rest")
 COMMAND("osd unset " \
        "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise", \

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 4580d826ffc3b384bce16918f6b0546cef6d6858..03aac656cb57c2cff88d909fb41fc6a061cce505 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2382,6 +2382,8 @@ string OSDMap::get_flag_string(unsigned f)
     s += ",sortbitwise";
   if (f & CEPH_OSDMAP_REQUIRE_JEWEL)
     s += ",require_jewel_osds";
+  if (f & CEPH_OSDMAP_REQUIRE_KRAKEN)
+    s += ",require_kraken_osds";
   if (s.length())
     s.erase(0, 1);
   return s;