]> git-server-git.apps.pok.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)
committerGreg Farnum <greg@inktank.com>
Thu, 3 Jul 2014 23:32:41 +0000 (16:32 -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>
src/mon/OSDMonitor.cc

index 16c281cc48b049421d9d4129b08e49748a685b99..9f4dbabe03805f2acb22a60da73f1a755e92db91 100644 (file)
@@ -2996,7 +2996,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;
   }