mon/OSDMonitor: set REQUIRE_JEWEL when setting REQUIRE_KRAKEN

Lots of checks look for the jewel flag; setting the
kraken flag should also set this one.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 822775024f7b8b09cffae13ddab0ccbbe5c4fcae..c50a584093974373e50ee520c16f8a1d10a5190e 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6418,7 +6418,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       }
     } else if (key == "require_kraken_osds") {
       if (osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_KRAKEN) {
-       return prepare_set_flag(op, CEPH_OSDMAP_REQUIRE_KRAKEN);
+       bool r = prepare_set_flag(op, CEPH_OSDMAP_REQUIRE_KRAKEN);
+       // ensure JEWEL is also set
+       pending_inc.new_flags |= CEPH_OSDMAP_REQUIRE_JEWEL;
+       return r;
       } else {
        ss << "not all up OSDs have CEPH_FEATURE_SERVER_KRAKEN feature";
        err = -EPERM;