From aca92996698536ce24ef80f0979543b0074e2610 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 8 Jan 2013 16:49:56 +1100 Subject: [PATCH] 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 (This used to be ctdb commit 735ec99b99c7bb579851ce8293011aaf1dcc552a) --- ctdb/config/events.d/00.ctdb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb index 847805bc64d..02613536f37 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)