From 91a8a9a98508aedf3d07bf83e5e53342fe74bdf5 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 19 Jan 2018 14:55:21 +1100 Subject: [PATCH] ctdb-recoverd: Drop unnecessary code This has already been done in update_flags(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14513 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit 3ab52b528673e08caa66f00e963528c591a84fe1) --- ctdb/server/ctdb_recoverd.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index f825427e7a3..d42333b860d 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2667,20 +2667,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, } } - /* - * Update node flags obtained from each active node. This ensure we have - * up-to-date information for all the nodes. - */ - for (j=0; jnum; j++) { - if (nodemap->nodes[j].pnn == ctdb->pnn) { - continue; - } - if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) { - continue; - } - nodemap->nodes[j].flags = remote_nodemaps[j]->nodes[j].flags; - } - for (j=0; jnum; j++) { if (nodemap->nodes[j].pnn == ctdb->pnn) { continue; -- 2.47.2