diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-06-14 03:51:01 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-08-25 13:57:29 +0000 |
| commit | 7723e7d23d7d02d281584b9ca74c966a6e3dc4e1 (patch) | |
| tree | 68862fa55477e6309dacd4f936fa1beb970c090d /ctdb | |
| parent | 1956ee1f6b8d03aad37300e318af7b5aea5e11ff (diff) | |
| download | samba-7723e7d23d7d02d281584b9ca74c966a6e3dc4e1.tar.gz | |
ctdb-recoverd: Get remote nodemaps earlier
update_local_flags() will be changed to use these nodemaps.
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 910a0b3b747a987ba69b6a0b6256e964b7d85dfe)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 138177a9187..18f40f25e90 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2555,6 +2555,13 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, } + /* 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"); + return; + } + /* ensure our local copies of flags are right */ ret = update_local_flags(rec, nodemap); if (ret != 0) { @@ -2631,13 +2638,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, goto takeover_run_checks; } - /* 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"); - return; - } - /* verify that all other nodes have the same nodemap as we have */ for (j=0; j<nodemap->num; j++) { |