[SCM] CTDB repository - branch master updated - ctdb-1.0.113-134-ge593101

Ronnie Sahlberg sahlberg at samba.org
Thu Mar 11 00:16:33 MST 2010


The branch, master has been updated
       via  e59310132d8126ee3afc191b5db56e80a32986e8 (commit)
       via  fde29921f14a815ea68911d758485c9070f4eb2a (commit)
       via  e1e285d9f7fa3237dbbacca52a4eb2b264fa5986 (commit)
      from  3d82ca5b1b8ba2770c739493aa0cdd34bb4827d8 (commit)

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


- Log -----------------------------------------------------------------
commit e59310132d8126ee3afc191b5db56e80a32986e8
Merge: 3d82ca5b1b8ba2770c739493aa0cdd34bb4827d8 fde29921f14a815ea68911d758485c9070f4eb2a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Mar 11 18:15:41 2010 +1100

    Merge root at 10.1.1.27:/shared/ctdb/ctdb-git

commit fde29921f14a815ea68911d758485c9070f4eb2a
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 e1e285d9f7fa3237dbbacca52a4eb2b264fa5986
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

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

Summary of changes:
 config/functions     |    3 ++-
 server/ctdb_vacuum.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 config/functions


Changeset truncated at 500 lines:

diff --git a/config/functions b/config/functions
old mode 100644
new mode 100755
index 6556b21..2c78b39
--- a/config/functions
+++ b/config/functions
@@ -557,7 +557,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 ()
@@ -690,6 +690,7 @@ ctdb_standard_event_handler ()
 	    exit
 	    ;;
 	setstatus)
+            shift
 	    ctdb_setstatus "$@"
 	    exit
 	    ;;
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


More information about the samba-cvs mailing list