From 36938bfdd075a174daecb466085702adfe6a6c09 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 15 Jun 2018 06:01:52 +1000 Subject: 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 Reviewed-by: Amitay Isaacs --- ctdb/client/client_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ctdb/client') diff --git a/ctdb/client/client_tunnel.c b/ctdb/client/client_tunnel.c index e30fe765005..a783afe47c8 100644 --- a/ctdb/client/client_tunnel.c +++ b/ctdb/client/client_tunnel.c @@ -431,7 +431,7 @@ struct tevent_req *ctdb_tunnel_request_send(TALLOC_CTX *mem_ctx, }; if (destnode == CTDB_BROADCAST_ALL || - destnode == CTDB_BROADCAST_VNNMAP || + destnode == CTDB_BROADCAST_ACTIVE || destnode == CTDB_BROADCAST_CONNECTED) { state->wait_for_reply = false; } -- cgit v1.2.1