Merge commit 'obnox/master-rebase'

diff --git a/config/functions b/config/functions
old mode 100644 (file)
new mode 100755 (executable)
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 7627fdd6ea1e55526536b80b706d756df81602fe..580686e2ba3445ec3684ee4dd65b03e3b5f5d680 100644 (file)
--- 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;