[SCM] CTDB repository - branch master updated - ctdb-1.0.114-12-g685be0a
Ronnie Sahlberg
sahlberg at samba.org
Tue Apr 6 18:46:18 MDT 2010
The branch, master has been updated
via 685be0a7e830464e01dccc744362040a75bc96b5 (commit)
via 7fa8486f9ffe2a039360b07423f734bdd884fe1d (commit)
from 5ed7d6788b8f7bf71d7d66c3a620b1aec54dfd81 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 685be0a7e830464e01dccc744362040a75bc96b5
Merge: 5ed7d6788b8f7bf71d7d66c3a620b1aec54dfd81 7fa8486f9ffe2a039360b07423f734bdd884fe1d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Wed Apr 7 10:45:27 2010 +1000
Merge root at 10.1.1.27:/shared/ctdb/ctdb-git
commit 7fa8486f9ffe2a039360b07423f734bdd884fe1d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Wed Apr 7 10:42:51 2010 +1000
Lower the loglevel for "Recovery lock successfully taken"
from ERR to NOTICE
BZ62086
-----------------------------------------------------------------------
Summary of changes:
server/ctdb_recover.c | 2 +-
server/ctdb_recoverd.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index ed5c22b..4a1e04c 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -819,7 +819,7 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep)
}
if (keep) {
- DEBUG(DEBUG_ERR, ("Recovery lock taken successfully\n"));
+ DEBUG(DEBUG_NOTICE, ("Recovery lock taken successfully\n"));
}
DEBUG(DEBUG_NOTICE,("ctdb_recovery_lock: Got recovery lock on '%s'\n", ctdb->recovery_lock_file));
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 949a1bc..f5aa77b 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1342,7 +1342,7 @@ static int do_recovery(struct ctdb_recoverd *rec,
return -1;
}
ctdb_ctrl_report_recd_lock_latency(ctdb, CONTROL_TIMEOUT(), timeval_elapsed(&start_time));
- DEBUG(DEBUG_ERR,("Recovery lock taken successfully by recovery daemon\n"));
+ DEBUG(DEBUG_NOTICE,("Recovery lock taken successfully by recovery daemon\n"));
}
DEBUG(DEBUG_NOTICE, (__location__ " Recovery initiated due to problem with node %u\n", rec->last_culprit_node));
--
CTDB repository
More information about the samba-cvs
mailing list