summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2021-07-09 17:25:32 +1000
committerJule Anger <janger@samba.org>2021-09-13 12:33:53 +0000
commit8d4c482410c4de451d26ce004247e9cc10aea832 (patch)
tree72fd81b73a7a2dbdb37c2afebf4aff85fa741958 /ctdb
parent7c353e6e383b408de9d2823b32ff8e0527510d02 (diff)
downloadsamba-8d4c482410c4de451d26ce004247e9cc10aea832.tar.gz
ctdb-daemon: Don't mark a node as unhealthy when connecting to it
Remote nodes are already initialised as UNHEALTHY when the node list is initialised at startup (ctdb_load_nodes_file() calls convert_node_map_to_list()) and when disconnected (ctdb_node_dead()). So, drop this code. RN: Fix CTDB flag/status update race conditions BUG: https://bugzilla.samba.org/show_bug.cgi?id=14784 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Thu Sep 9 02:38:34 UTC 2021 on sn-devel-184 (cherry picked from commit 9e7d2d9794af7251c42cb22f23ee9f86c6ea05c1) Autobuild-User(v4-15-test): Jule Anger <janger@samba.org> Autobuild-Date(v4-15-test): Mon Sep 13 12:33:53 UTC 2021 on sn-devel-184
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_server.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index 1470b00dba5..ec6480c5067 100644
--- a/ctdb/server/ctdb_server.c
+++ b/ctdb/server/ctdb_server.c
@@ -337,7 +337,6 @@ void ctdb_node_connected(struct ctdb_node *node)
node->ctdb->num_connected++;
node->dead_count = 0;
node->flags &= ~NODE_FLAGS_DISCONNECTED;
- node->flags |= NODE_FLAGS_UNHEALTHY;
DEBUG(DEBUG_ERR,
("%s: connected to %s - %u connected\n",
node->ctdb->name, node->name, node->ctdb->num_connected));