From: Martin Schwenke <martin@meltin.net>
Date: Thu, 13 Jun 2019 17:51:01 +0000 (+1000)
Subject: ctdb-recoverd: Get remote nodemaps earlier
X-Git-Tag: samba-4.11.14~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7723e7d23d7d02d281584b9ca74c966a6e3dc4e1;p=thirdparty%2Fsamba.git

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)
---

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++) {