The branch, 1.0.112 has been updated
via 072cba118f0edf0d642cf138ee49186ab4ef2602 (commit)
via 0d49271b7a5b7525d81440d17c7c3010cf750ca4 (commit)
from 11a0dde12ea21eae684504e50a090599662fafb5 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.112
- Log -----------------------------------------------------------------
commit 072cba118f0edf0d642cf138ee49186ab4ef2602
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date: Thu Oct 14 08:08:52 2010 +1100
new version -1.0.112-38
commit 0d49271b7a5b7525d81440d17c7c3010cf750ca4
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date: Thu Oct 14 08:06:47 2010 +1100
Try to restart LOCKD if "service nfslock start" fails.
Some systems this command occasionally returns [OK] == success
but lock manager fails to start.
Dodgy service scripts.
CQ1020366
-----------------------------------------------------------------------
Summary of changes:
config/events.d/60.nfs | 8 +++++++-
config/functions | 8 ++++++++
packaging/RPM/ctdb.spec.in | 4 +++-
3 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 00cceb3..2c48d05 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -93,7 +93,13 @@ case "$1" in
} || exit $?
# check that lockd responds to rpc requests
- ctdb_check_rpc "lockd" 100021 1
+ (ctdb_check_rpc "lockd" 100021 1)
+ [ $? = "0" ] || {
+ echo "Trying to restart lock manager service"
+ startstop_nfslock restart
+ exit 1
+ }
+
echo "$STATD_SHARED_DIRECTORY" | ctdb_check_directories "statd" || \
exit $?
diff --git a/config/functions b/config/functions
index 05c5ed7..b5354cf 100755
--- a/config/functions
+++ b/config/functions
@@ -379,6 +379,10 @@ startstop_nfslock() {
stop)
service nfsserver stop > /dev/null 2>&1
;;
+ restart)
+ service nfsserver stop
+ service nfsserver start
+ ;;
esac
;;
rhel)
@@ -389,6 +393,10 @@ startstop_nfslock() {
stop)
service nfslock stop > /dev/null 2>&1
;;
+ restart)
+ service nfslock stop
+ service nfslock start
+ ;;
esac
;;
*)
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 6177c0e..0adb693 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team <sa...@samba.org>
Name: ctdb
Version: 1.0.112
-Release: 37
+Release: 38
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -125,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/ctdb/tests/bin/ctdb_transaction
%changelog
+* Wed Oct 14 2010 : Version 1.0.112-38
+ - Try to restart LOCKD if "service nfslock start" fails.
* Wed Oct 13 2010 : Version 1.0.112-37
-Always make sure to create the state directories
* Tue Oct 5 2010 : Version 1.0.112-36
--
CTDB repository
