From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Oct 2016 16:28:18 +0000 (-0400)
Subject: mon/OSDMonitor: set REQUIRE_JEWEL when setting REQUIRE_KRAKEN
X-Git-Tag: v11.1.0~631^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6244755a7051abe2e89d9f1ff75a10c4b76ee3b5;p=ceph.git

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 822775024f7..c50a5840939 100644
--- 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;