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

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: jlbec
Date: 2006-04-19 18:19:27 -0500 (Wed, 19 Apr 2006)
New Revision: 2874

Modified:
   branches/ocfs2-1.2-cert/patches/bad-lock-during-convert-debug-msg.patch
   branches/ocfs2-1.2-cert/patches/change-yield-to-cond_resched.patch
   branches/ocfs2-1.2-cert/patches/continue-finalize-reco.patch
   branches/ocfs2-1.2-cert/patches/dlm-check-recovery-flag-before-convert.patch
   branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch
   branches/ocfs2-1.2-cert/patches/dlm-quiet-noisy-mastery-reco-msgs.patch
   branches/ocfs2-1.2-cert/patches/dlm-wait-for-recovery-msgs.patch
   branches/ocfs2-1.2-cert/patches/enomem-on-other-reco-node-warning.patch
   branches/ocfs2-1.2-cert/patches/fix-wait-for-recovery.patch
   branches/ocfs2-1.2-cert/patches/fix-wait-in-mastery.patch
   branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch
   branches/ocfs2-1.2-cert/patches/remove-bad-spin-unlock.patch
Log:
annotation
Signed-off-by: jlbec

Modified: branches/ocfs2-1.2-cert/patches/bad-lock-during-convert-debug-msg.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/bad-lock-during-convert-debug-msg.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/bad-lock-during-convert-debug-msg.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,4 @@
+noisy error message
 Index: cert3/fs/ocfs2/dlm/dlmconvert.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-19 14:50:16.975963000 -0700

Modified: branches/ocfs2-1.2-cert/patches/change-yield-to-cond_resched.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/change-yield-to-cond_resched.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/change-yield-to-cond_resched.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,5 @@
+yield does not yield.  cond_resched does.
+
 Index: cert3/fs/ocfs2/dlm/dlmthread.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmthread.c	2006-04-19 14:49:35.477211000 -0700

Modified: branches/ocfs2-1.2-cert/patches/continue-finalize-reco.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/continue-finalize-reco.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/continue-finalize-reco.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,5 @@
+do NOT stop when a dead node is encountered.  dead nodes do not affect the recovery.
+
 Index: cert3/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-19 14:49:55.629726000 -0700

Modified: branches/ocfs2-1.2-cert/patches/dlm-check-recovery-flag-before-convert.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-check-recovery-flag-before-convert.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/dlm-check-recovery-flag-before-convert.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,6 @@
+before checking for a nonexistent lock, make sure the lockres is not marked
+RECOVERING.  the caller will just retry and the state should be fixed up when
+recovery completes.
 Index: cert3/fs/ocfs2/dlm/dlmconvert.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmconvert.c	2006-04-19 14:48:49.395074000 -0700

Modified: branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/dlm-fix_dlm_lock_reco_handling.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,4 @@
+DLM_RECOVERING should not have been used for this.  pick another status.
 Index: cert3/fs/ocfs2/dlm/dlmlock.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmlock.c	2006-04-19 14:50:04.744827000 -0700

Modified: branches/ocfs2-1.2-cert/patches/dlm-quiet-noisy-mastery-reco-msgs.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-quiet-noisy-mastery-reco-msgs.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/dlm-quiet-noisy-mastery-reco-msgs.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,4 @@
+tune down some noisy messages
 Index: cert3/fs/ocfs2/dlm/dlmmaster.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmmaster.c	2006-04-19 14:50:07.569861000 -0700

Modified: branches/ocfs2-1.2-cert/patches/dlm-wait-for-recovery-msgs.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-wait-for-recovery-msgs.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/dlm-wait-for-recovery-msgs.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,4 @@
+noisy messages
 Index: cert3/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-19 14:49:59.980437000 -0700

Modified: branches/ocfs2-1.2-cert/patches/enomem-on-other-reco-node-warning.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/enomem-on-other-reco-node-warning.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/enomem-on-other-reco-node-warning.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,5 @@
+just a noisy message
+undesirable
 Index: cert3/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-19 14:49:46.581623000 -0700

Modified: branches/ocfs2-1.2-cert/patches/fix-wait-for-recovery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/fix-wait-for-recovery.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/fix-wait-for-recovery.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,4 @@
+take out the debugging spinning stuff and just make the caller wait for the event
 Index: cert3/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-19 14:50:07.611861000 -0700

Modified: branches/ocfs2-1.2-cert/patches/fix-wait-in-mastery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/fix-wait-in-mastery.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/fix-wait-in-mastery.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,5 @@
+wait for any nodes to be recovered when starting mastery.
+
 Index: cert3/fs/ocfs2/dlm/dlmcommon.h
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmcommon.h	2006-04-19 14:49:21.724673000 -0700

Modified: branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,5 @@
+move dlm work off of schedule_work and onto a dedicated worker thread.  this
+needs to send and receive network messages, block, etc.
 Index: cert3/fs/ocfs2/dlm/dlmcommon.h
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmcommon.h	2006-04-19 14:49:59.930437000 -0700

Modified: branches/ocfs2-1.2-cert/patches/remove-bad-spin-unlock.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/remove-bad-spin-unlock.patch	2006-04-19 23:10:16 UTC (rev 2873)
+++ branches/ocfs2-1.2-cert/patches/remove-bad-spin-unlock.patch	2006-04-19 23:19:27 UTC (rev 2874)
@@ -1,3 +1,4 @@
+missed this in a previous patch.  very bad results.
 Index: cert3/fs/ocfs2/dlm/dlmrecovery.c
 ===================================================================
 --- cert3.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-04-19 14:49:48.801979000 -0700