[SCM] CTDB repository - branch master updated - ctdb-1.10-29-g582e5cd

[Ronnie Sahlberg]

The branch, master has been updated
       via  582e5cd077501e8d4131a9c7981781471308edfd (commit)
       via  ddb73962d72d933bf0edc28be0dbb45bea7e5ef4 (commit)
      from  d98f175e8420d921a123ae9c0ce00945350b1537 (commit)

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


- Log -----------------------------------------------------------------
commit 582e5cd077501e8d4131a9c7981781471308edfd
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Nov 18 13:23:40 2010 +1100

    60.nfs eventscript should do nothing if NFS isn't managed by CTDB.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit ddb73962d72d933bf0edc28be0dbb45bea7e5ef4
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Nov 18 11:27:10 2010 +1100

    Eventscript functions - catch failures in ctdb_service_start().
    
    ctdb_service_start() currently succeeds if ctdb_counter_init()
    succeeds.
    
    This changes it to fail when a service start fails.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 config/events.d/60.nfs |    2 ++
 config/functions       |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 8889cad..ff56166 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -19,6 +19,8 @@ loadconfig
 
 ctdb_start_stop_service
 
+is_ctdb_managed_service || exit 0
+
 case "$1" in 
      init)
 	# read statd from persistent database
diff --git a/config/functions b/config/functions
index a7e3e53..5dd31fe 100755
--- a/config/functions
+++ b/config/functions
@@ -706,9 +706,9 @@ ctdb_start_stop_service ()
 ctdb_service_start ()
 {
     if [ -n "$service_start" ] ; then
-	eval $service_start
+	eval $service_start || return $?
     else
-	service "$service_name" start
+	service "$service_name" start || return $?
     fi
     ctdb_counter_init
 }


-- 
CTDB repository