diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-01-08 16:49:56 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-01-09 12:45:59 +1100 |
| commit | aca92996698536ce24ef80f0979543b0074e2610 (patch) | |
| tree | 5738cc36cdb2b342a43abded4f42049b0cd9b330 | |
| parent | 4f622fe9fb204a6362fee468d9c7e31e22acb124 (diff) | |
| download | samba-aca92996698536ce24ef80f0979543b0074e2610.tar.gz samba-aca92996698536ce24ef80f0979543b0074e2610.tar.xz samba-aca92996698536ce24ef80f0979543b0074e2610.zip | |
eventscripts: Fail the setup event if CTDB does not become ready
Currently it silently continues without attempting to set tunables.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 735ec99b99c7bb579851ce8293011aaf1dcc552a)
| -rwxr-xr-x | ctdb/config/events.d/00.ctdb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb index 847805bc64..02613536f3 100755 --- a/ctdb/config/events.d/00.ctdb +++ b/ctdb/config/events.d/00.ctdb @@ -79,10 +79,9 @@ case "$1" in setup) # Make sure CTDB daemon is ready to process requests - if wait_until_ready ; then - # set any tunables from the config file - set_ctdb_variables - fi || exit 1 + wait_until_ready || die "CTDB did not become ready for setup" + # Set any tunables from the config file + set_ctdb_variables || die "Failed to set CTDB tunables" ;; startup) |