[Ocfs2-commits] khackel commits r2823 - branches/ocfs2-1.2-cert/patches

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-04-05 17:29:03 -0500 (Wed, 05 Apr 2006)
New Revision: 2823

Added:
   branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
Modified:
   branches/ocfs2-1.2-cert/patches/series
Log:
adding debug-bad-recovery.patch
Signed-off-by: jlbec

Added: branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-04 20:22:11 UTC (rev 2822)
+++ branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch	2006-04-05 22:29:03 UTC (rev 2823)
@@ -0,0 +1,47 @@
+Index: cert2/fs/ocfs2/dlm/dlmconvert.c
+===================================================================
+--- cert2.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 14:47:56.219381000 -0700
++++ cert2/fs/ocfs2/dlm/dlmconvert.c	2006-04-05 15:18:32.987025000 -0700
+@@ -476,6 +476,19 @@
+ 		}
+ 		lock = NULL;
+ 	}
++	if (!lock) {
++		__dlm_print_one_lock_resource(res);
++		list_for_each(iter, &res->granted) {
++			lock = list_entry(iter, struct dlm_lock, list);
++			if (lock->ml.node == cnv->node_idx) {
++				mlog(ML_ERROR, "ahaha there is something here "
++				     "for node %u, lock->ml.cookie=%llu, "
++				     "cnv->cookie=%llu\n", cnv->node_idx,
++				     lock->ml.cookie, cnv->cookie);
++
++			}
++		}
++	}
+ 	spin_unlock(&res->spinlock);
+ 	if (!lock) {
+ 		status = DLM_IVLOCKID;
+Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
+===================================================================
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-05 15:15:05.616701000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c	2006-04-05 15:18:54.703262000 -0700
+@@ -488,7 +488,7 @@
+ 		     dlm->reco.dead_node);
+ 		//dlm_print_reco_junk(dlm);
+ 	}
+-		
++#if 0
+ 	while (1) {
+ 		if (wait_event_timeout(dlm->reco.event, 
+ 				       !dlm_in_recovery(dlm), 
+@@ -501,7 +501,8 @@
+ 		     dlm->reco.dead_node);
+ 		//dlm_print_reco_junk(dlm);
+ 	}
+-	// wait_event(dlm->reco.event, !dlm_in_recovery(dlm));
++#endif
++	wait_event(dlm->reco.event, !dlm_in_recovery(dlm));
+ }
+ 
+ static void dlm_begin_recovery(struct dlm_ctxt *dlm)

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-04-04 20:22:11 UTC (rev 2822)
+++ branches/ocfs2-1.2-cert/patches/series	2006-04-05 22:29:03 UTC (rev 2823)
@@ -30,3 +30,4 @@
 move-dlm-work-to-thread.patch 
 hb-add_tracking_around_configured_nodes 
 jrnl-change_gfp_kernel_to_nofs 
+debug-bad-recovery.patch