[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-246-ga500cc6

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  a500cc6cf2f118355bee7d983d4355341309d636 (commit)
       via  11b234458621fe0cbc72a36cae0ee7d9c1d06cf9 (commit)
       via  cb5451d4c164cc3ed20d026344c53c4ee492fc04 (commit)
       via  cdac098f3c829011830b63edba571856875c7b8d (commit)
       via  a24ac016323be5edcbae7d614315df92d77e1773 (commit)
      from  92bcf1c475d8497e08a0babf7a7b3434dade7208 (commit)

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


- Log -----------------------------------------------------------------
commit a500cc6cf2f118355bee7d983d4355341309d636
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Nov 18 15:40:19 2010 +1100

    update autostart/stop to work for samba

commit 11b234458621fe0cbc72a36cae0ee7d9c1d06cf9
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Nov 18 14:15:18 2010 +1100

    add an explicit _is_managed_service to iscsi eventscript

commit cb5451d4c164cc3ed20d026344c53c4ee492fc04
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Nov 18 13:52:46 2010 +1100

    Dont pollute the logs with a "file not found" message
    
    CQ S1020745

commit cdac098f3c829011830b63edba571856875c7b8d
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 a24ac016323be5edcbae7d614315df92d77e1773
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/50.samba |    5 ++++-
 config/events.d/60.nfs   |    4 +++-
 config/events.d/70.iscsi |    2 ++
 config/functions         |   13 ++++++-------
 4 files changed, 15 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 5338c92..54a29cf 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -77,6 +77,7 @@ start_samba() {
 		nice_service "$CTDB_SERVICE_NMB" start
 		nice_service "$CTDB_SERVICE_SMB" start
 	}
+	return 0
 }
 
 stop_samba() {
@@ -91,6 +92,8 @@ stop_samba() {
 	[ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
 		service "$CTDB_SERVICE_WINBIND" stop
 	}
+
+	return 0
 }
 
 # set default samba cleanup period - in minutes
@@ -204,7 +207,7 @@ periodic_cleanup() {
 ###########################
 
 ctdb_start_stop_service
-ctdb_start_stop_service "windbind"
+ctdb_start_stop_service "winbind"
 
 is_ctdb_managed_service || is_ctdb_managed_service "winbind" || exit 0
 
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 8889cad..23f22b7 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
@@ -154,7 +156,7 @@ case "$1" in
 
 	# once every 60 seconds, update the statd state database for which
 	# clients need notifications
-	LAST_UPDATE=`stat --printf="%Y" $CTDB_VARDIR/state/statd/update-trigger`
+	LAST_UPDATE=`stat --printf="%Y" $CTDB_VARDIR/state/statd/update-trigger 2>/dev/null`
 	CURRENT_TIME=`date +"%s"`
 	[ $CURRENT_TIME -ge $(($LAST_UPDATE + 60)) ] && {
 	    mkdir -p $CTDB_VARDIR/state/statd
diff --git a/config/events.d/70.iscsi b/config/events.d/70.iscsi
index a3cf040..a050259 100755
--- a/config/events.d/70.iscsi
+++ b/config/events.d/70.iscsi
@@ -7,6 +7,8 @@ service_name="iscsi"
 
 ctdb_start_stop_service
 
+is_ctdb_managed_service || exit 0
+
 [ -z "$CTDB_START_ISCSI_SCRIPTS" ] && {
 	echo "No iscsi start script directory found"
 	exit 0
diff --git a/config/functions b/config/functions
index a7e3e53..ee38225 100755
--- a/config/functions
+++ b/config/functions
@@ -669,7 +669,7 @@ is_ctdb_managed_service ()
     ctdb_compat_managed_service "$CTDB_MANAGES_VSFTPD"   "vsftpd"
     ctdb_compat_managed_service "$CTDB_MANAGES_SAMBA"    "samba"
     ctdb_compat_managed_service "$CTDB_MANAGES_SCP"      "scp"
-    ctdb_compat_managed_service "$CTDB_MANAGES_WINDBIND" "windbind"
+    ctdb_compat_managed_service "$CTDB_MANAGES_WINBIND"  "winbind"
     ctdb_compat_managed_service "$CTDB_MANAGES_HTTPD"    "httpd"
     ctdb_compat_managed_service "$CTDB_MANAGES_ISCSI"    "iscsi"
     ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD"    "clamd"
@@ -684,8 +684,7 @@ ctdb_start_stop_service ()
     _service_name="${1:-${service_name}}"
 
     _active="$ctdb_active_dir/$_service_name"
-
-    if is_ctdb_managed_service ; then
+    if is_ctdb_managed_service "$_service_name"; then
 	if ! [ -e "$_active" ] ; then
 	    echo "Starting service $_service_name"
 	    ctdb_service_start || exit $?
@@ -693,22 +692,22 @@ ctdb_start_stop_service ()
 	    touch "$_active"
 	    exit 0
 	fi
-    elif ! is_ctdb_managed_service ; then
+    else
 	if [ -e "$_active" ] ; then
 	    echo "Stopping service $_service_name"
 	    ctdb_service_stop || exit $?
 	    rm -f "$_active"
+	    exit 0
 	fi
-	exit 0
     fi
 }
 
 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