sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Rename the tunable EventScriptBanCount to EventScriptTimeoutCount

Browse Source 
since we no longer ban nodes when dodgy scripts continue to hang.

We now only mark nodes as unhealthy if monitor events fail or timeout. Never ban.

(This used to be ctdb commit 5c8e56fc7a518e115bceac257867739283cf6a1e)
This commit is contained in:
Ronnie Sahlberg 2009-12-14 15:53:23 +11:00
parent ed6b5a8c68
commit 649ba2631d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/include/ctdb_private.h
View File

@ -103,7 +103,7 @@ struct ctdb_tunable {
uint32_t monitor_interval;
uint32_t tickle_update_interval;
uint32_t script_timeout;
uint32_t script_ban_count; /* ban after this many consec timeouts*/
uint32_t script_timeout_count; /* allow dodgy scripts to hang this many times in a row before we mark the node unhealthy */
uint32_t recovery_grace_period;
uint32_t recovery_ban_period;
uint32_t database_hash_size;

4
ctdb/server/ctdb_monitor.c
View File

@ -126,8 +126,8 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p)
if (status == -ETIME) {
ctdb->event_script_timeouts++;
if (ctdb->event_script_timeouts > ctdb->tunable.script_ban_count) {
DEBUG(DEBUG_ERR, ("Maximum timeout count %u reached for eventscript. Making node unhealthy\n", ctdb->tunable.script_ban_count));
if (ctdb->event_script_timeouts >= ctdb->tunable.script_timeout_count) {
DEBUG(DEBUG_ERR, ("Maximum timeout count %u reached for eventscript. Making node unhealthy\n", ctdb->tunable.script_timeout_count));
} else {
/* We pretend this is OK. */
goto after_change_status;

2
ctdb/server/ctdb_tunables.c
View File

@ -38,7 +38,7 @@ static const struct {
{ "MonitorInterval", 15, offsetof(struct ctdb_tunable, monitor_interval) },
{ "TickleUpdateInterval",20, offsetof(struct ctdb_tunable, tickle_update_interval) },
{ "EventScriptTimeout", 30, offsetof(struct ctdb_tunable, script_timeout) },
{ "EventScriptBanCount", 10, offsetof(struct ctdb_tunable, script_ban_count) },
{ "EventScriptTimeoutCount", 1, offsetof(struct ctdb_tunable, script_timeout_count) },
{ "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) },