diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-06-15 06:01:52 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-07-02 08:51:22 +0200 |
| commit | 36938bfdd075a174daecb466085702adfe6a6c09 (patch) | |
| tree | 98279fd5d3f6fa75b9061b84ba9678a2a520c0c4 /ctdb/protocol | |
| parent | ec72fadecd5233234947633360fe46a3a4053c07 (diff) | |
| download | samba-36938bfdd075a174daecb466085702adfe6a6c09.tar.gz | |
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>
Diffstat (limited to 'ctdb/protocol')
| -rw-r--r-- | ctdb/protocol/protocol.h | 2 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_debug.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h index cb807e3b939..7189fab43f0 100644 --- a/ctdb/protocol/protocol.h +++ b/ctdb/protocol/protocol.h @@ -44,7 +44,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 4e156639118..a34f5a86947 100644 --- a/ctdb/protocol/protocol_debug.c +++ b/ctdb/protocol/protocol_debug.c @@ -264,8 +264,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) { |