From: Andrew Tridgell Date: Wed, 10 Oct 2007 00:45:22 +0000 (+1000) Subject: make sure reconnected nodes start off as unhealthy so they don't get a public IP X-Git-Tag: tevent-0.9.20~348^2~2384 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=011a205b86c0f64d5ed52e4f77ff2e98f3aba2aa;p=thirdparty%2Fsamba.git make sure reconnected nodes start off as unhealthy so they don't get a public IP (This used to be ctdb commit c733ec6760cae01ce277f491caf1355e46de5cf7) --- diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c index d1ef4f46f33..5c579f00228 100644 --- a/ctdb/server/ctdb_server.c +++ b/ctdb/server/ctdb_server.c @@ -335,7 +335,7 @@ void ctdb_node_dead(struct ctdb_node *node) return; } node->ctdb->num_connected--; - node->flags |= NODE_FLAGS_DISCONNECTED; + node->flags |= NODE_FLAGS_DISCONNECTED | NODE_FLAGS_UNHEALTHY; node->rx_cnt = 0; node->dead_count = 0; DEBUG(1,("%s: node %s is dead: %u connected\n", @@ -357,6 +357,7 @@ 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(1,("%s: connected to %s - %u connected\n", node->ctdb->name, node->name, node->ctdb->num_connected)); }