ctdb-daemon: Change handling of default capabilities

Centrally define all the default capabilities to make the defaults
crystal clear.  Capability-related command-line options now have a
direct correspondence rather than a reverse correspondence.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 80c68602d2f4f01988d363538253737376242e0b..bb0056e9d67d6358fee74af84d3f5bd21035d3b4 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -594,8 +594,11 @@ struct ctdb_node_map {
  */
 #define CTDB_CAP_PARALLEL_RECOVERY     0x00010000
 
-#define CTDB_CAP_DEFAULT               (CTDB_CAP_PARALLEL_RECOVERY)
+#define CTDB_CAP_FEATURES              (CTDB_CAP_PARALLEL_RECOVERY)
 
+#define CTDB_CAP_DEFAULT               (CTDB_CAP_RECMASTER | \
+                                        CTDB_CAP_LMASTER   | \
+                                        CTDB_CAP_FEATURES)
 
 struct ctdb_public_ip {
        uint32_t pnn;

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index ff9ad6ade65cf8b9ab2f266a20846e12ac7f346f..ac289c6f2d430d2f741e0610b9842bf65e9566ba 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -219,11 +219,11 @@ int main(int argc, const char *argv[])
 
        /* set ctdbd capabilities */
        ctdb->capabilities = CTDB_CAP_DEFAULT;
-       if (options.no_lmaster == 0) {
-               ctdb->capabilities |= CTDB_CAP_LMASTER;
+       if (options.no_lmaster != 0) {
+               ctdb->capabilities &= ~CTDB_CAP_LMASTER;
        }
-       if (options.no_recmaster == 0) {
-               ctdb->capabilities |= CTDB_CAP_RECMASTER;
+       if (options.no_recmaster != 0) {
+               ctdb->capabilities &= ~CTDB_CAP_RECMASTER;
        }
        if (options.lvs != 0) {
                ctdb->capabilities |= CTDB_CAP_LVS;