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

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-03-27 17:32:36 -0600 (Mon, 27 Mar 2006)
New Revision: 2792

Added:
   branches/ocfs2-1.2-cert/patches/fix-recovery-spin.patch
Modified:
   branches/ocfs2-1.2-cert/patches/series
Log:
* fix bug 5117194: OCFS2 RECOVERY IS STUCK
* in dlm_pre_master_reco_lockres, return 0 if a node dies, not the network error

Signed-off-by: jlbec



Added: branches/ocfs2-1.2-cert/patches/fix-recovery-spin.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/fix-recovery-spin.patch	2006-03-27 22:34:50 UTC (rev 2791)
+++ branches/ocfs2-1.2-cert/patches/fix-recovery-spin.patch	2006-03-27 23:32:36 UTC (rev 2792)
@@ -0,0 +1,21 @@
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c	2006-03-27 14:44:59.603059672 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c	2006-03-27 14:44:59.667049944 -0800
+@@ -875,7 +875,7 @@
+ 		} 
+ 
+ 		dlm_kick_recovery_thread(dlm);
+-		msleep(100);
++		msleep(1000);
+ 		dlm_wait_for_recovery(dlm);
+ 
+ 		spin_lock(&dlm->spinlock);
+@@ -2106,6 +2106,7 @@
+ 				BUG();
+ 			/* host is down, so answer for that node would be
+ 			 * DLM_LOCK_RES_OWNER_UNKNOWN.  continue. */
++			ret = 0;
+ 		}
+ 
+ 		if (master != DLM_LOCK_RES_OWNER_UNKNOWN) {

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-03-27 22:34:50 UTC (rev 2791)
+++ branches/ocfs2-1.2-cert/patches/series	2006-03-27 23:32:36 UTC (rev 2792)
@@ -14,3 +14,4 @@
 mar24-create-lock-handler.patch -p0
 mastery-restart-recovery.patch -p0
 leave-other-dead-nodes-on-recovery-list.patch 
+fix-recovery-spin.patch