diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-04-24 14:41:21 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-04-24 14:45:07 +1000 |
| commit | 3363480da4c8f0ea6799eba968d7cd5f8406512e (patch) | |
| tree | db4e0d0af25cd267c37f62b425a25a6f1dea1994 /ctdb | |
| parent | e5532b6f26ab76eeeb9ef23f4570e3c475a08ca5 (diff) | |
tweak some timeouts so that we do trigger a banning even if the control hangs/timesout
(This used to be ctdb commit 1860a365e6ba8212e15c33016c80a2adcf8d10f4)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 4 | ||||
| -rw-r--r-- | ctdb/server/ctdb_tunables.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 4d9f8a70cf..c6d0a7a5f4 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1346,9 +1346,9 @@ static int do_recovery(struct ctdb_recoverd *rec, if (rec->culprit_counter > 2*nodemap->num) { DEBUG(DEBUG_NOTICE,("Node %u has caused %u recoveries in %.0f seconds - banning it for %u seconds\n", - culprit, rec->culprit_counter, timeval_elapsed(&rec->first_recover_time), + rec->last_culprit, rec->culprit_counter, timeval_elapsed(&rec->first_recover_time), ctdb->tunable.recovery_ban_period)); - ctdb_ban_node(rec, culprit, ctdb->tunable.recovery_ban_period); + ctdb_ban_node(rec, rec->last_culprit, ctdb->tunable.recovery_ban_period); } if (!ctdb_recovery_lock(ctdb, true)) { diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c index 31ec89f82e..330ab1999c 100644 --- a/ctdb/server/ctdb_tunables.c +++ b/ctdb/server/ctdb_tunables.c @@ -31,7 +31,7 @@ static const struct { { "KeepaliveInterval", 5, offsetof(struct ctdb_tunable, keepalive_interval) }, { "KeepaliveLimit", 5, offsetof(struct ctdb_tunable, keepalive_limit) }, { "MaxLACount", 7, offsetof(struct ctdb_tunable, max_lacount) }, - { "RecoverTimeout", 30, offsetof(struct ctdb_tunable, recover_timeout) }, + { "RecoverTimeout", 20, offsetof(struct ctdb_tunable, recover_timeout) }, { "RecoverInterval", 1, offsetof(struct ctdb_tunable, recover_interval) }, { "ElectionTimeout", 3, offsetof(struct ctdb_tunable, election_timeout) }, { "TakeoverTimeout", 5, offsetof(struct ctdb_tunable, takeover_timeout) }, @@ -39,7 +39,7 @@ static const struct { { "TickleUpdateInterval",20, offsetof(struct ctdb_tunable, tickle_update_interval) }, { "EventScriptTimeout", 20, offsetof(struct ctdb_tunable, script_timeout) }, { "EventScriptBanCount", 5, offsetof(struct ctdb_tunable, script_ban_count) }, - { "RecoveryGracePeriod", 60, offsetof(struct ctdb_tunable, recovery_grace_period) }, + { "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) }, { "DatabaseMaxDead", 5, offsetof(struct ctdb_tunable, database_max_dead) }, |