diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-06-22 22:52:34 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-06-22 22:52:34 +0930 |
| commit | 8946028a0748c048dad5407e83e7dd61e2d9fa4b (patch) | |
| tree | aaa6d1c2003c045df86d152720547aba95a53749 /ctdb/server/ctdb_monitor.c | |
| parent | ed31caffabd71b61269b2a33dfdd3322d397bbe1 (diff) | |
| download | samba-8946028a0748c048dad5407e83e7dd61e2d9fa4b.tar.gz samba-8946028a0748c048dad5407e83e7dd61e2d9fa4b.tar.xz samba-8946028a0748c048dad5407e83e7dd61e2d9fa4b.zip | |
speed startup: add --sloppy-start.
The extra recovery interval wait was introduced in 821333afb458 but no
explanation was provided in that message. Nonetheless, if starting
the entire cluster for the first time, it should be safe to skip this.
We use the commandline arg --sloppy-start which should discourage
people from using it outside testing.
Seconds between ctdbd first log message and node healthy:
BEFORE: 16.10
AFTER: 4.03
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(This used to be ctdb commit 509e2e89ae233a0e91998d95267bf62f296a73cd)
Diffstat (limited to 'ctdb/server/ctdb_monitor.c')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index 9038ef0982..3343501624 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -245,7 +245,7 @@ static void ctdb_wait_until_recovered(struct event_context *ev, struct timed_eve } - if (timeval_elapsed(&ctdb->last_recovery_finished) < (ctdb->tunable.rerecovery_timeout + 3)) { + if (!fast_start && timeval_elapsed(&ctdb->last_recovery_finished) < (ctdb->tunable.rerecovery_timeout + 3)) { ctdb->db_persistent_startup_generation = INVALID_GENERATION; DEBUG(DEBUG_NOTICE,(__location__ " wait for pending recoveries to end. Wait one more second.\n")); |