[SCM] CTDB repository - branch master updated - ctdb-1.0.108-54-g68a8ee9

[Ronnie Sahlberg]

The branch, master has been updated
       via  68a8ee99b128a5ec883600735626bdb3bbc9c503 (commit)
      from  af6656f2844d8fd72204a70358c9d589dbe1bd34 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 68a8ee99b128a5ec883600735626bdb3bbc9c503
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Dec 14 15:40:54 2009 +1100

    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

-----------------------------------------------------------------------

Summary of changes:
 include/ctdb_private.h |    1 -
 server/ctdb_monitor.c  |    4 ----
 server/ctdb_tunables.c |    1 -
 3 files changed, 0 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 142bbd5..0118dab 100644
--- 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 0e5fbc2..54cdac1 100644
--- 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 6f657e6..6eb1b43 100644
--- 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) },


-- 
CTDB repository