diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-03-11 18:15:41 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-03-11 18:15:41 +1100 |
| commit | d4f7a5996075e58d7a46e707e22bcc1cd846469c (patch) | |
| tree | db477dbeced9770b309597e7b8727c0177e6c01b /ctdb | |
| parent | c57c06df8c63ec3ee8e902c57c867240ebc1e9f6 (diff) | |
| parent | 3cf183ca40603e57dbe339b301188a7a0f9d0c9d (diff) | |
| download | samba-d4f7a5996075e58d7a46e707e22bcc1cd846469c.tar.gz samba-d4f7a5996075e58d7a46e707e22bcc1cd846469c.tar.xz samba-d4f7a5996075e58d7a46e707e22bcc1cd846469c.zip | |
Merge root@10.1.1.27:/shared/ctdb/ctdb-git
(This used to be ctdb commit e59310132d8126ee3afc191b5db56e80a32986e8)
Diffstat (limited to 'ctdb')
| -rwxr-xr-x[-rw-r--r--] | ctdb/config/functions | 3 | ||||
| -rw-r--r-- | ctdb/server/ctdb_vacuum.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions index 6556b218ec..2c78b396f8 100644..100755 --- a/ctdb/config/functions +++ b/ctdb/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/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index 7627fdd6ea..580686e2ba 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/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; |