remove the variable "disable when unhealthy"

there is no rational need for a setting where we permanently mark nodes as disabled everytime an eventscript fails

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 142bbd5c716b79159d5e64b17d50c6d97e5ead93..0118dabf43e9d2bda2e0acd6b77d82cc56fb6492 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -112,7 +112,6 @@ struct ctdb_tunable {
        uint32_t rerecovery_timeout;
        uint32_t enable_bans;
        uint32_t deterministic_public_ips;
-       uint32_t disable_when_unhealthy;
        uint32_t reclock_ping_period;
        uint32_t no_ip_failback;
        uint32_t verbose_memory_names;

diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 0e5fbc2eb477ec421ca61719cfd83458e10425ad..54cdac1b62527240bd164691fb2d3f37703f7e86 100644 (file)
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -138,10 +138,6 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p)
                DEBUG(DEBUG_NOTICE,("monitor event failed - disabling node\n"));
                node->flags |= NODE_FLAGS_UNHEALTHY;
                ctdb->monitor->next_interval = 5;
-               if (ctdb->tunable.disable_when_unhealthy != 0) {
-                       DEBUG(DEBUG_INFO, ("DISABLING node since it became unhealthy\n"));
-                       node->flags |= NODE_FLAGS_DISABLED;
-               }
 
                ctdb_run_notification_script(ctdb, "unhealthy");
 

diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 6f657e61dae6b949edbcd17889374e024fe64949..6eb1b435297c44e74511ed60f718aeb5641eeae0 100644 (file)
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -47,7 +47,6 @@ static const struct {
        { "RerecoveryTimeout",   10,  offsetof(struct ctdb_tunable, rerecovery_timeout) },
        { "EnableBans",           1,  offsetof(struct ctdb_tunable, enable_bans) },
        { "DeterministicIPs",     1,  offsetof(struct ctdb_tunable, deterministic_public_ips) },
-       { "DisableWhenUnhealthy", 0,  offsetof(struct ctdb_tunable, disable_when_unhealthy) },
        { "ReclockPingPeriod",   60,  offsetof(struct ctdb_tunable,  reclock_ping_period) },
        { "NoIPFailback",         0,  offsetof(struct ctdb_tunable, no_ip_failback) },
        { "VerboseMemoryNames",   0,  offsetof(struct ctdb_tunable, verbose_memory_names) },