From c71ecae7cc609f1e3c2286140af55487cb6ed344 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 22 Jan 2015 13:56:38 -0800 Subject: [PATCH] mon/OSDMonitor: validate crush features for osd (not just mon) We need to check that the OSD features are met as well. Backport: giant, firefly Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 6029bf0a3dfdd..424f6b969c55e 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3691,12 +3691,13 @@ bool OSDMonitor::validate_crush_against_features(const CrushWrapper *newcrush, OSDMap newmap; newmap.deepish_copy_from(osdmap); newmap.apply_incremental(new_pending); - uint64_t features = newmap.get_features(CEPH_ENTITY_TYPE_MON, NULL); - stringstream features_ss; + uint64_t features = + newmap.get_features(CEPH_ENTITY_TYPE_MON, NULL) | + newmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL); + stringstream features_ss; int r = check_cluster_features(features, features_ss); - if (!r) return true; -- 2.39.5