[SCM] CTDB repository - branch master updated - ctdb-1.0.114-365-g3695462

[Ronnie Sahlberg]

The branch, master has been updated
       via  3695462ade497356d1b86c6fd1bc1765f1d11e57 (commit)
       via  2913cc93a9a172caf9e0d6675cfa4de4cc957b13 (commit)
      from  9ddf89e01f1845eec1712d75fb811240e8bb0e37 (commit)

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


- Log -----------------------------------------------------------------
commit 3695462ade497356d1b86c6fd1bc1765f1d11e57
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Oct 14 09:49:23 2010 +1100

    If tdb_open() fails when trying to open the vacuuming database,
    print errno so we get some idea of why this failed.

commit 2913cc93a9a172caf9e0d6675cfa4de4cc957b13
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Oct 14 08:12:41 2010 +1100

    try to restart NFS LOCKD if it failed to start

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

Summary of changes:
 config/events.d/60.nfs |    7 ++++++-
 config/functions       |    8 ++++++++
 server/ctdb_vacuum.c   |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index cd5219a..ed96ab8 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -79,7 +79,12 @@ 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
+	}
 
 	# mount needs special handling since it is sometimes not started
 	# correctly on RHEL5
diff --git a/config/functions b/config/functions
index 9771905..9659d48 100755
--- a/config/functions
+++ b/config/functions
@@ -417,6 +417,10 @@ startstop_nfslock() {
 		stop)
 			service nfsserver stop > /dev/null 2>&1
 			;;
+		restart)
+			service nfsserver stop
+			service nfsserver start
+			;;
 		esac
 		;;
 	rhel)
@@ -427,6 +431,10 @@ startstop_nfslock() {
 		stop)
 			service nfslock stop > /dev/null 2>&1
 			;;
+		restart)
+			service nfslock stop
+			service nfslock start
+			;;
 		esac
 		;;
 	*)
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index b0c7d40..4104853 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -702,7 +702,7 @@ static int get_vacuum_interval(struct ctdb_db_context *ctdb_db)
 		       flags,
 		       O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
-		DEBUG(DEBUG_ERR,("Unable to open/create database %s using default interval\n", vac_dbname));
+		DEBUG(DEBUG_ERR,("Unable to open/create database %s using default interval. Errno : %s (%d)\n", vac_dbname, strerror(errno), errno));
 		talloc_free(tmp_ctx);
 		return interval;
 	}


-- 
CTDB repository