Revert "cleanup: remove a tunable we no longer use in the eventscripts any more :"

This reverts commit 401f421fa003d9515df15e759b50b56e0c67d69c.

Conflicts:

	include/ctdb_private.h
	server/ctdb_tunables.c

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index b6c4b2fa1af34b277fa21eb8785715bdc4ba5fda..feff0bc24eedace19e42ade814317077f919308d 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -104,6 +104,7 @@ struct ctdb_tunable {
        uint32_t tickle_update_interval;
        uint32_t script_timeout;
        uint32_t script_timeout_count; /* allow dodgy scripts to hang this many times in a row before we mark the node unhealthy */
+       uint32_t script_unhealthy_on_timeout; /* obsolete */
        uint32_t recovery_grace_period;
        uint32_t recovery_ban_period;
        uint32_t database_hash_size;

diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 872260384bdb1663eda9835ce85466d425caec96..17949d10aea05d55f74124b9ae354c45fda6e25e 100644 (file)
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -39,6 +39,7 @@ static const struct {
        { "TickleUpdateInterval",20,  offsetof(struct ctdb_tunable, tickle_update_interval) },
        { "EventScriptTimeout",  30,  offsetof(struct ctdb_tunable, script_timeout) },
        { "EventScriptTimeoutCount", 1,  offsetof(struct ctdb_tunable, script_timeout_count) },
+       { "EventScriptUnhealthyOnTimeout", 0, offsetof(struct ctdb_tunable, script_unhealthy_on_timeout) },/* OBSOLETE */
        { "RecoveryGracePeriod", 120,  offsetof(struct ctdb_tunable, recovery_grace_period) },
        { "RecoveryBanPeriod",  300,  offsetof(struct ctdb_tunable, recovery_ban_period) },
        { "DatabaseHashSize", 10000,  offsetof(struct ctdb_tunable, database_hash_size) },