ctdb-server: Rename CTDB_BROADCAST_VNNMAP -> CTDB_BROADCAST_ACTIVE

This broadcast is misnamed.  Both places where this type of broadcast
is used expect the broadcast to go to all active nodes.

Make the corresponding change to the semantics in the daemon by
sending to all active nodes.

There is a mismatch between the ideas of VNN map and active nodes.  A
node that is not in the VNN map but is active can still host database
records.  These were the same until the LMASTER capability was
introduced and then the logic was not updated.

The only place where the VNN map is relevant is when finding the
location master of a record in the migration code.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13499

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 36938bfdd075a174daecb466085702adfe6a6c09)

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index e116b3a98b897a582dce460376710fb9ff544d58..07554b585e8155ae2684115df2b4acd841ce9af2 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -43,7 +43,7 @@ enum ctdb_operation {
 /* send a broadcast to all nodes in the cluster, active or not */
 #define CTDB_BROADCAST_ALL    0xF0000002
 /* send a broadcast to all nodes in the current vnn map */
-#define CTDB_BROADCAST_VNNMAP 0xF0000003
+#define CTDB_BROADCAST_ACTIVE 0xF0000003
 /* send a broadcast to all connected nodes */
 #define CTDB_BROADCAST_CONNECTED 0xF0000004
 /* send a broadcast to selected connected nodes */

diff --git a/ctdb/protocol/protocol_debug.c b/ctdb/protocol/protocol_debug.c
index 7c6d862a5001009fedcb43df244e68621b5cc09c..163bb41ba32bebca984206f09fbd38bfca1b3a3e 100644 (file)
--- a/ctdb/protocol/protocol_debug.c
+++ b/ctdb/protocol/protocol_debug.c
@@ -262,8 +262,8 @@ static void ctdb_pnn_print(uint32_t pnn, FILE *fp)
                fprintf(fp, "CURRENT");
        } else if (pnn == CTDB_BROADCAST_ALL) {
                fprintf(fp, "ALL");
-       } else if (pnn == CTDB_BROADCAST_VNNMAP) {
-               fprintf(fp, "VNNMAP");
+       } else if (pnn == CTDB_BROADCAST_ACTIVE) {
+               fprintf(fp, "ACTIVE");
        } else  if (pnn == CTDB_BROADCAST_CONNECTED) {
                fprintf(fp, "CONNECTED");
        } else if (pnn == CTDB_MULTICAST) {

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 6835ccaf0634e8d8e85ee67f70ab9d3e70c99bdc..f7a8b6b6e65c7444546c621401afac58fbfe7122 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -859,7 +859,7 @@ int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
                return -1;
        }
 
-       if (((destnode == CTDB_BROADCAST_VNNMAP) || 
+       if (((destnode == CTDB_BROADCAST_ACTIVE) ||
             (destnode == CTDB_BROADCAST_ALL) ||
             (destnode == CTDB_BROADCAST_CONNECTED)) && 
            !(flags & CTDB_CTRL_FLAG_NOREPLY)) {
@@ -867,7 +867,7 @@ int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
                return -1;
        }
 
-       if (destnode != CTDB_BROADCAST_VNNMAP && 
+       if (destnode != CTDB_BROADCAST_ACTIVE &&
            destnode != CTDB_BROADCAST_ALL && 
            destnode != CTDB_BROADCAST_CONNECTED && 
            (!ctdb_validate_pnn(ctdb, destnode) || 

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index c199aac2d1dd4747843fade848b56f3025a45192..1962f854683755d29d69b2d68c09523081f7c2a3 100644 (file)
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -1535,9 +1535,15 @@ static void ctdb_ltdb_seqnum_check(struct tevent_context *ev,
                TDB_DATA data;
                data.dptr = (uint8_t *)&ctdb_db->db_id;
                data.dsize = sizeof(uint32_t);
-               ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_VNNMAP, 0,
-                                        CTDB_CONTROL_UPDATE_SEQNUM, 0, CTDB_CTRL_FLAG_NOREPLY,
-                                        data, NULL, NULL);             
+               ctdb_daemon_send_control(ctdb,
+                                        CTDB_BROADCAST_ACTIVE,
+                                        0,
+                                        CTDB_CONTROL_UPDATE_SEQNUM,
+                                        0,
+                                        CTDB_CTRL_FLAG_NOREPLY,
+                                        data,
+                                        NULL,
+                                        NULL);
        }
        ctdb_db->seqnum = new_seqnum;
 

diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index 900674132ac08818f22c2df35648f2354b610480..93256ecfd584147c28f252b41d51a2ff0edfcd36 100644 (file)
--- a/ctdb/server/ctdb_server.c
+++ b/ctdb/server/ctdb_server.c
@@ -389,14 +389,18 @@ static void ctdb_broadcast_packet_all(struct ctdb_context *ctdb,
 }
 
 /*
-  broadcast a packet to all nodes in the current vnnmap
+  broadcast a packet to all active nodes
 */
-static void ctdb_broadcast_packet_vnnmap(struct ctdb_context *ctdb, 
+static void ctdb_broadcast_packet_active(struct ctdb_context *ctdb,
                                         struct ctdb_req_header *hdr)
 {
        int i;
-       for (i=0;i<ctdb->vnn_map->size;i++) {
-               hdr->destnode = ctdb->vnn_map->map[i];
+       for (i = 0; i < ctdb->num_nodes; i++) {
+               if (ctdb->nodes[i]->flags & NODE_FLAGS_INACTIVE) {
+                       continue;
+               }
+
+               hdr->destnode = ctdb->nodes[i]->pnn;
                ctdb_queue_packet(ctdb, hdr);
        }
 }
@@ -430,8 +434,8 @@ void ctdb_queue_packet(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
        case CTDB_BROADCAST_ALL:
                ctdb_broadcast_packet_all(ctdb, hdr);
                return;
-       case CTDB_BROADCAST_VNNMAP:
-               ctdb_broadcast_packet_vnnmap(ctdb, hdr);
+       case CTDB_BROADCAST_ACTIVE:
+               ctdb_broadcast_packet_active(ctdb, hdr);
                return;
        case CTDB_BROADCAST_CONNECTED:
                ctdb_broadcast_packet_connected(ctdb, hdr);

diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c
index 04a41138a72bc8bdaacfcaf9626ecc43fc7fccd4..5ea197095996276fc870b00e8db158f3f4a9a226 100644 (file)
--- a/ctdb/server/ctdb_traverse.c
+++ b/ctdb/server/ctdb_traverse.c
@@ -387,8 +387,8 @@ static struct ctdb_traverse_all_handle *ctdb_daemon_traverse_all(struct ctdb_db_
        }
 
        if (ctdb_db_volatile(ctdb_db)) {
-               /* normal database, traverse all nodes */         
-               destination = CTDB_BROADCAST_VNNMAP;
+               /* volatile database, traverse all active nodes */
+               destination = CTDB_BROADCAST_ACTIVE;
        } else {
                int i;
                /* persistent database, traverse one node, preferably