[SCM] CTDB repository - branch master updated - ctdb-2.0-53-g735ec99

[Amitay Isaacs]

The branch, master has been updated
       via  735ec99b99c7bb579851ce8293011aaf1dcc552a (commit)
      from  50abf597cefe6f8ea2a2ff7694bf84641344a9b1 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 735ec99b99c7bb579851ce8293011aaf1dcc552a
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Jan 8 16:49:56 2013 +1100

    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 at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/00.ctdb |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/00.ctdb b/config/events.d/00.ctdb
index 847805b..0261353 100755
--- a/config/events.d/00.ctdb
+++ b/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)


-- 
CTDB repository