[Ocfs2-commits] smushran commits r2826 - branches/ocfs2-1.2-cert/patches

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: khackel
Date: 2006-04-06 12:54:18 -0500 (Thu, 06 Apr 2006)
New Revision: 2826

Modified:
   branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
Log:
patch debug-bad-recovery.patch updated
messages toned down
Signed-off-by: khackel

Modified: branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-06 03:53:30 UTC (rev 2825)
+++ branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-06 17:54:18 UTC (rev 2826)
@@ -59,3 +59,60 @@
  }
  
  static void dlm_begin_recovery(struct dlm_ctxt *dlm)
+@@ -752,12 +753,11 @@ static int dlm_remaster_locks(struct dlm
+ 					break;
+ 				case DLM_RECO_NODE_DATA_RECEIVING:
+ 				case DLM_RECO_NODE_DATA_REQUESTED:
+-					if (pass % 1000)
+-						mlg = ML_ERROR;
+-					else if (pass % 100 == 0)
++					mlg = 0;
++					if (pass % 100 == 0)
+ 						mlg = ML_NOTICE;
+-					else
+-						mlg = 0;
++					if (pass % 1000 == 0)
++						mlg = ML_ERROR;
+ 					mlog(mlg, "%s: node %u still in state %s\n",
+ 					     dlm->name, ndata->node_num,
+ 					     ndata->state==DLM_RECO_NODE_DATA_RECEIVING ?
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-05 18:15:23.453462000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c	2006-04-05 19:35:40.567829000 -0700
+@@ -1694,13 +1694,13 @@ again:
+ 		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) {
+@@ -2086,7 +2086,8 @@ void dlm_assert_master_worker(struct dlm
+ 				   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. */
+@@ -2861,7 +2862,7 @@ top:
+ 				 * 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);