diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-01-18 20:02:42 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2020-08-27 10:48:08 +0000 |
| commit | 48ca1987350683b58c9bd43cd54ea9e2614da337 (patch) | |
| tree | 73b7b34236ee9363d31c14a384cbe11f8badf93a | |
| parent | a1f00ebef11708808c399f8b0d446b309e5da016 (diff) | |
| download | samba-48ca1987350683b58c9bd43cd54ea9e2614da337.tar.gz | |
ctdb-recoverd: Change get_remote_nodemaps() to use connected nodes
The plan here is to use the nodemaps retrieved by get_remote_nodes()
in update_local_flags(). This will improve efficiency, since
get_remote_nodes() fetches flags from nodes in parallel. It also
means that get_remote_nodes() can be used exactly once early on in
main_loop() to retrieve remote nodemaps. Retrieving nodemaps multiple
times is unnecessary and racy - a single monitoring iteration should
not fetch flags multiple times and compare them.
This introduces a temporary behaviour change but it will be of no
consequence when the above changes are made.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14466
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 762d1d8a9605f97973a2c1176de5d29fcc61d15a)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index b910aacce7c..0cdaab75878 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2288,7 +2288,7 @@ static int get_remote_nodemaps(struct ctdb_recoverd *rec, return -1; } - nodes = list_of_active_nodes(ctdb, rec->nodemap, mem_ctx, true); + nodes = list_of_connected_nodes(ctdb, rec->nodemap, mem_ctx, true); state.remote_nodemaps = t; state.rec = rec; @@ -2631,8 +2631,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, goto takeover_run_checks; } - /* get the nodemap for all active remote nodes - */ + /* Get the nodemaps for all connected remote nodes */ ret = get_remote_nodemaps(rec, mem_ctx, &remote_nodemaps); if (ret != 0) { DBG_ERR("Failed to read remote nodemaps\n"); |