Skip to content

Commit

Permalink
ocfs2: tune down some noisy messages during dlm recovery
Browse files Browse the repository at this point in the history
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
  • Loading branch information
Kurt Hackel authored and Mark Fasheh committed Jun 26, 2006
1 parent 56a7c10 commit 3b3b84a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions fs/ocfs2/dlm/dlmmaster.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
&assert, sizeof(assert), to, &r);
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)) {
mlog(ML_ERROR, "unhandled error!\n");
mlog(ML_ERROR, "unhandled error=%d!\n", tmpret);
BUG();
}
/* 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 */
ret = tmpret;
} else if (r < 0) {
Expand Down Expand Up @@ -2029,7 +2029,8 @@ static void dlm_assert_master_worker(struct dlm_work_item *item, void *data)
nodemap, flags);
if (ret < 0) {
/* no need to restart, we are done */
mlog_errno(ret);
if (!dlm_is_host_down(ret))
mlog_errno(ret);
}

/* Ok, we've asserted ourselves. Let's let migration start. */
Expand Down Expand Up @@ -2808,7 +2809,7 @@ void dlm_clean_master_list(struct dlm_ctxt *dlm, u8 dead_node)
* may result in the mle being unlinked and
* freed, but there may still be a process
* 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);
atomic_set(&mle->woken, 1);
spin_unlock(&mle->spinlock);
Expand Down
2 changes: 1 addition & 1 deletion fs/ocfs2/dlm/dlmrecovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ static int dlm_in_recovery(struct dlm_ctxt *dlm)
void dlm_wait_for_recovery(struct dlm_ctxt *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",
dlm->name, dlm->dlm_reco_thread_task->pid,
dlm->reco.state, dlm->reco.new_master,
Expand Down

0 comments on commit 3b3b84a

Please sign in to comment.