]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSDMonitor: fix quorum_features comparison in check_cluster_features
authorGreg Farnum <greg@inktank.com>
Thu, 3 Jul 2014 22:24:30 +0000 (15:24 -0700)
committerSage Weil <sage@inktank.com>
Sat, 5 Jul 2014 21:43:27 +0000 (14:43 -0700)
We need to see if there's a feature which is not in the quorum_features,
not if there are no features in common!

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 2280c0eaa9f3f733062085a5e7f7dc23c3bbe291)

src/mon/OSDMonitor.cc

index dca75415b68c2487ba143c41ac87b8110a054d20..81d07b1e39bceb9ad2976c83c5588aba549cc698 100644 (file)
@@ -2975,7 +2975,7 @@ int OSDMonitor::check_cluster_features(uint64_t features,
 {
   stringstream unsupported_ss;
   int unsupported_count = 0;
-  if (!(mon->get_quorum_features() & features)) {
+  if ((mon->get_quorum_features() & features) != features) {
     unsupported_ss << "the monitor cluster";
     ++unsupported_count;
   }