diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-12-16 09:51:17 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-12-16 09:51:17 +1100 |
| commit | 640c48c8446d610623ca4babbfedfccf80bb6f78 (patch) | |
| tree | ae58bc88be13d8e94b3ff28c4b9d01d619d7e3b2 | |
| parent | fcd16342f684dfd78a5889d2550cc64e31dedc42 (diff) | |
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
(This used to be ctdb commit b883d19a495a41a22db37f9c2cf6250fee529de0)
| -rw-r--r-- | ctdb/include/ctdb_private.h | 1 | ||||
| -rw-r--r-- | ctdb/server/ctdb_tunables.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index b6c4b2fa1a..feff0bc24e 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/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/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c index 872260384b..17949d10ae 100644 --- a/ctdb/server/ctdb_tunables.c +++ b/ctdb/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) }, |