[SCM] CTDB repository - branch master updated - ctdb-1.10-199-gf90485b

[Ronnie Sahlberg]

The branch, master has been updated
       via  f90485b08d32cbe56050718a3b28ca0fe1d64e0f (commit)
      from  d67955b42f7627be9dae995230c8fcbb8a948ec2 (commit)

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


- Log -----------------------------------------------------------------
commit f90485b08d32cbe56050718a3b28ca0fe1d64e0f
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue May 10 08:25:27 2011 +1000

    If samba fails to start for some reason, make this cause the startup event to fail too,   so that ctdbd will re-try the startup event later.
    Or else this will leave samba not running.
    
    CQ S1023394

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

Summary of changes:
 config/events.d/50.samba |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 415b89f..7a152b5 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -65,7 +65,11 @@ start_samba() {
 
 	# start the winbind service
 	[ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
-		service "$CTDB_SERVICE_WINBIND" start
+		service "$CTDB_SERVICE_WINBIND" start || {
+			echo failed to start winbind
+			exit 1
+		}
+
 	}
 
 	# start Samba service. Start it reniced, as under very heavy load 
@@ -74,8 +78,15 @@ start_samba() {
 	[ "$CTDB_MANAGES_SAMBA" = "yes" ] && {
 		/usr/bin/net serverid wipe
 
-		nice_service "$CTDB_SERVICE_NMB" start
-		nice_service "$CTDB_SERVICE_SMB" start
+		nice_service "$CTDB_SERVICE_NMB" start || {
+			echo failed to start nmbd
+			exit 1
+		}
+
+		nice_service "$CTDB_SERVICE_SMB" start || {
+			echo failed to start samba
+			exit 1
+		}
 	}
 	return 0
 }


-- 
CTDB repository