From: Greg Farnum <greg@inktank.com>
Date: Thu, 3 Jul 2014 22:24:30 +0000 (-0700)
Subject: OSDMonitor: fix quorum_features comparison in check_cluster_features
X-Git-Tag: v0.80.2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0a8d194f2c44a73c31ae8c52fabb430d66d4a1b1;p=ceph.git

OSDMonitor: fix quorum_features comparison in check_cluster_features

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)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index dca75415b68c2..81d07b1e39bce 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -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;
   }