[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-52-g8fdf131

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  8fdf1318ac2b10ab4e95651bdc67c0e0391eae95 (commit)
       via  b8599e835320f7d8ea7bf04d1dd37391fed0eb35 (commit)
       via  005685bcfeaf27e169490ea8d268e016a909694f (commit)
       via  8186099ef77281bdb52853f0878cfc1484936a4a (commit)
       via  94f12fdd17a817662eac2135d98549ab394eafc1 (commit)
      from  392f243fdbd5085da5c3c57fde044df3dfe79d03 (commit)

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


- Log -----------------------------------------------------------------
commit 8fdf1318ac2b10ab4e95651bdc67c0e0391eae95
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Mar 11 18:05:06 2010 +1100

     new version 1.0.112-12
    
    * Wed Mar 11 2010 : Version 1.0.112-12
     - From christian ambach : drop the loglevel of a vacuuming message
     - From  Wolfgang Mueller-Friedt : fix bug in ctdb_setstatus
     - Use "service nfs status" instead of rpcinfo when probing nfs
     - make sure to always create the tickles directory

commit b8599e835320f7d8ea7bf04d1dd37391fed0eb35
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Wed Mar 10 18:46:15 2010 +0100

    adjust a vacuum log level
    
    made the severity of the decreasing interval log level the same as for the increasing,
    they are both just info logs because they don't report errors

commit 005685bcfeaf27e169490ea8d268e016a909694f
Author: Wolfgang Mueller-Friedt <wolfmuel at de.ibm.com>
Date:   Wed Mar 10 10:39:31 2010 +0100

    ctdb_setstatus in /etc/ctdb/functions was not working correctly because it was called with a wrong parameter list

commit 8186099ef77281bdb52853f0878cfc1484936a4a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Mar 9 05:27:41 2010 +1100

    Make sure to always create the tickle directories for nfs
    on the monitor event
    
    BZ56707

commit 94f12fdd17a817662eac2135d98549ab394eafc1
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Mar 9 05:15:33 2010 +1100

    Change the test if NFS is working to use "service nfs status"
    instead of rpcinfo to the nfs program.

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

Summary of changes:
 config/events.d/60.nfs       |    8 ++++----
 config/events.d/61.nfstickle |    5 +++++
 config/functions             |    3 ++-
 packaging/RPM/ctdb.spec.in   |    7 ++++++-
 server/ctdb_vacuum.c         |    2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 config/functions


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 2115d46..61c8081 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -75,10 +75,10 @@ case "$1" in
 		echo "ERROR: STATD is not responding. Trying to restart it. [rpc.statd $RPCSTATDOPTS]"
 	}
 
-
-	# check that NFS responds to rpc requests
-	[ "$CTDB_NFS_SKIP_KNFSD_ALIVE_CHECK" = "yes" ] || {
-	    ctdb_check_rpc "NFS" 100003 3
+	# check that NFS is running
+	service nfs status 2>/dev/null >/dev/null || {
+		echo NFS is not running
+		exit 1
 	}
 
 	# and that its directories are available
diff --git a/config/events.d/61.nfstickle b/config/events.d/61.nfstickle
index c91d393..9900498 100755
--- a/config/events.d/61.nfstickle
+++ b/config/events.d/61.nfstickle
@@ -17,6 +17,11 @@ ctdb_start_stop_service
 
 store_tickles()
 {
+	# always create these direcotries since NFS might be enabled at runtime
+	# and we dont want to restart ctdbd
+	mkdir -p $CTDB_BASE/state/nfstickle
+	mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`
+
 	mydir=$NFS_TICKLE_SHARED_DIRECTORY/`hostname`
 	rm -f $mydir/*
 	# record our connections to shared storage
diff --git a/config/functions b/config/functions
old mode 100644
new mode 100755
index 87026ac..5c15422
--- a/config/functions
+++ b/config/functions
@@ -461,7 +461,7 @@ ctdb_active_dir="$ctdb_spool_dir/active"
 
 log_status_cat ()
 {
-    echo "node is \"$1\", problem with \"${script_name}\": $(cat $2)"
+    echo "node is \"$1\", \"${script_name}\" reports problem: $(cat $2)"
 }
 
 ctdb_checkstatus ()
@@ -594,6 +594,7 @@ ctdb_standard_event_handler ()
 	    exit
 	    ;;
 	setstatus)
+            shift
 	    ctdb_setstatus "$@"
 	    exit
 	    ;;
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 658c522..7622300 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 11
+Release: 12
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -123,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Wed Mar 11 2010 : Version 1.0.112-12
+ - From christian ambach : drop the loglevel of a vacuuming message
+ - From  Wolfgang Mueller-Friedt : fix bug in ctdb_setstatus
+ - Use "service nfs status" instead of rpcinfo when probing nfs
+ - make sure to always create the tickles directory
 * Thu Feb 25 2010 : Version 1.0.112-11
  - Increase default script timeout to 90 seconds. 
    BZ 61113
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 7627fdd..580686e 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -571,7 +571,7 @@ static int update_tuning_db(struct ctdb_db_context *ctdb_db, struct vacuum_data
 				tdata.new_interval > ctdb_db->ctdb->tunable.vacuum_max_interval) {
 				tdata.new_interval = ctdb_db->ctdb->tunable.vacuum_min_interval;
 			}		
-			DEBUG(DEBUG_ERR,("Decreasing vacuum interval %u -> %u for %s\n", 
+			DEBUG(DEBUG_INFO,("Decreasing vacuum interval %u -> %u for %s\n", 
 					 tdata.last_interval, tdata.new_interval, ctdb_db->db_name));
 		}
 		tdata.last_interval = tdata.new_interval;


-- 
CTDB repository