Commit 3b3b84a8 authored by Kurt Hackel's avatar Kurt Hackel Committed by Mark Fasheh

ocfs2: tune down some noisy messages during dlm recovery

Signed-off-by: default avatarKurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 56a7c104
...@@ -1639,13 +1639,13 @@ static int dlm_do_assert_master(struct dlm_ctxt *dlm, const char *lockname, ...@@ -1639,13 +1639,13 @@ static int dlm_do_assert_master(struct dlm_ctxt *dlm, const char *lockname,
tmpret = o2net_send_message(DLM_ASSERT_MASTER_MSG, dlm->key, tmpret = o2net_send_message(DLM_ASSERT_MASTER_MSG, dlm->key,
&assert, sizeof(assert), to, &r); &assert, sizeof(assert), to, &r);
if (tmpret < 0) { if (tmpret < 0) {
mlog(ML_ERROR, "assert_master returned %d!\n", tmpret); mlog(0, "assert_master returned %d!\n", tmpret);
if (!dlm_is_host_down(tmpret)) { if (!dlm_is_host_down(tmpret)) {
mlog(ML_ERROR, "unhandled error!\n"); mlog(ML_ERROR, "unhandled error=%d!\n", tmpret);
BUG(); BUG();
} }
/* a node died. finish out the rest of the nodes. */ /* a node died. finish out the rest of the nodes. */
mlog(ML_ERROR, "link to %d went down!\n", to); mlog(0, "link to %d went down!\n", to);
/* any nonzero status return will do */ /* any nonzero status return will do */
ret = tmpret; ret = tmpret;
} else if (r < 0) { } else if (r < 0) {
...@@ -2029,6 +2029,7 @@ static void dlm_assert_master_worker(struct dlm_work_item *item, void *data) ...@@ -2029,6 +2029,7 @@ static void dlm_assert_master_worker(struct dlm_work_item *item, void *data)
nodemap, flags); nodemap, flags);
if (ret < 0) { if (ret < 0) {
/* no need to restart, we are done */ /* no need to restart, we are done */
if (!dlm_is_host_down(ret))
mlog_errno(ret); mlog_errno(ret);
} }
...@@ -2808,7 +2809,7 @@ void dlm_clean_master_list(struct dlm_ctxt *dlm, u8 dead_node) ...@@ -2808,7 +2809,7 @@ void dlm_clean_master_list(struct dlm_ctxt *dlm, u8 dead_node)
* may result in the mle being unlinked and * may result in the mle being unlinked and
* freed, but there may still be a process * freed, but there may still be a process
* waiting in the dlmlock path which is fine. */ * waiting in the dlmlock path which is fine. */
mlog(ML_ERROR, "node %u was expected master\n", mlog(0, "node %u was expected master\n",
dead_node); dead_node);
atomic_set(&mle->woken, 1); atomic_set(&mle->woken, 1);
spin_unlock(&mle->spinlock); spin_unlock(&mle->spinlock);
......
...@@ -410,7 +410,7 @@ static int dlm_in_recovery(struct dlm_ctxt *dlm) ...@@ -410,7 +410,7 @@ static int dlm_in_recovery(struct dlm_ctxt *dlm)
void dlm_wait_for_recovery(struct dlm_ctxt *dlm) void dlm_wait_for_recovery(struct dlm_ctxt *dlm)
{ {
if (dlm_in_recovery(dlm)) { if (dlm_in_recovery(dlm)) {
mlog(ML_NOTICE, "%s: reco thread %d in recovery: " mlog(0, "%s: reco thread %d in recovery: "
"state=%d, master=%u, dead=%u\n", "state=%d, master=%u, dead=%u\n",
dlm->name, dlm->dlm_reco_thread_task->pid, dlm->name, dlm->dlm_reco_thread_task->pid,
dlm->reco.state, dlm->reco.new_master, dlm->reco.state, dlm->reco.new_master,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment