mon: allow firefly crush tunables to be selected

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index c6de486364b679f4d03227ead94868fa4c383092..f53b0c031b9c06f6685ec227870a5e0d84e534b5 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -213,6 +213,8 @@ ceph osd crush tunables legacy
 ceph osd crush show-tunables | grep argonaut
 ceph osd crush tunables bobtail
 ceph osd crush show-tunables | grep bobtail
+ceph osd crush tunables firefly
+ceph osd crush show-tunables | grep firefly
 
 # how do I tell when these are done?
 ceph osd scrub 0

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index bff1f2e7b5aeece54d2dde7f6a99b62620c07990..871f678f277312df2970539e94a8fee406b740d0 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -423,7 +423,7 @@ COMMAND("osd crush reweight " \
        "change <name>'s weight to <weight> in crush map", \
        "osd", "rw", "cli,rest")
 COMMAND("osd crush tunables " \
-       "name=profile,type=CephChoices,strings=legacy|argonaut|bobtail|optimal|default", \
+       "name=profile,type=CephChoices,strings=legacy|argonaut|bobtail|firefly|optimal|default", \
        "set crush tunables values to <profile>", "osd", "rw", "cli,rest")
 COMMAND("osd crush show-tunables", \
        "show current crush tunables", "osd", "r", "cli,rest")

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8bf63ccdc5a8bd0b1d7b30fa2cc3415d8216ff42..257a5fcf0984430456fab8dd81f1b11600fdf2f1 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3489,6 +3489,8 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
       newcrush.set_tunables_legacy();
     } else if (profile == "bobtail") {
       newcrush.set_tunables_bobtail();
+    } else if (profile == "firefly") {
+      newcrush.set_tunables_firefly();
     } else if (profile == "optimal") {
       newcrush.set_tunables_optimal();
     } else if (profile == "default") {

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 89cf6c9a6a040a6c4354f9dd71906d9ae5c6c8e3..9557131a0e5dbb1b1686a87860875fa4aff1048a 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -690,7 +690,8 @@ class TestOSD(TestArgparse):
                                                     '2.3']))
 
     def test_crush_tunables(self):
-        for tunable in ('legacy', 'argonaut', 'bobtail', 'optimal', 'default'):
+        for tunable in ('legacy', 'argonaut', 'bobtail', 'firefly',
+                                               'optimal', 'default'):
             self.assert_valid_command(['osd', 'crush', 'tunables',
                                        tunable])
         assert_equal({}, validate_command(sigdict, ['osd', 'crush',