[SCM] CTDB repository - branch master updated - ctdb-1.10-32-g37ab57e
Ronnie Sahlberg
sahlberg at samba.org
Mon Nov 22 03:26:42 MST 2010
The branch, master has been updated
via 37ab57e2adaecc3f7996ea20af45a5df0cd8be76 (commit)
via 44f683a1ba15944d3306a0effd572de3280ff975 (commit)
via ea8bb7b26bb879a895c267d49672433182390d0d (commit)
from 582e5cd077501e8d4131a9c7981781471308edfd (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 37ab57e2adaecc3f7996ea20af45a5df0cd8be76
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Nov 18 15:40:19 2010 +1100
update autostart/stop to work for samba
commit 44f683a1ba15944d3306a0effd572de3280ff975
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 ea8bb7b26bb879a895c267d49672433182390d0d
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
-----------------------------------------------------------------------
Summary of changes:
config/events.d/50.samba | 5 ++++-
config/events.d/60.nfs | 2 +-
config/events.d/70.iscsi | 2 ++
config/functions | 9 ++++-----
4 files changed, 11 insertions(+), 7 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 ff56166..23f22b7 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -156,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 5dd31fe..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,13 +692,13 @@ 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 repository
More information about the samba-cvs
mailing list