]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon: Fix bug in feature testing
authorAdam C. Emerson <aemerson@redhat.com>
Tue, 8 Nov 2016 15:57:14 +0000 (10:57 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 17 Nov 2016 00:54:31 +0000 (19:54 -0500)
Since we're comparing against a bitmask, the boolean rather than bitwise
operator can't be right.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/mon/MDSMonitor.cc

index e0b8be5de1430defebdd96ae02970ce3e086b2e0..c511a2f80c23c70814a71e223ebb69ef4c9ad5db 100644 (file)
@@ -1533,7 +1533,7 @@ class FlagSetHandler : public FileSystemCommandHandler
         return r;
       }
 
-      bool jewel = mon->get_quorum_con_features() && CEPH_FEATURE_SERVER_JEWEL;
+      bool jewel = mon->get_quorum_con_features() & CEPH_FEATURE_SERVER_JEWEL;
       if (flag_bool && !jewel) {
         ss << "Multiple-filesystems are forbidden until all mons are updated";
         return -EINVAL;