[Ocfs2-commits] jlbec commits r2796 - branches/ocfs2-1.2-cert/patches

[svn-commits@oss.oracle.com]

Author: jlbec
Signed-off-by: khackel
Date: 2006-03-28 13:27:56 -0600 (Tue, 28 Mar 2006)
New Revision: 2796

Removed:
   branches/ocfs2-1.2-cert/patches/leave-other-dead-nodes-on-recovery-list.patch
   branches/ocfs2-1.2-cert/patches/silence-reco-msg.patch
Modified:
   branches/ocfs2-1.2-cert/patches/series
Log:

o We need to leave dead nodes on the recovery list!  They might have
  migrated locks to us that we don't know about.

Signed-off-by: khackel



Deleted: branches/ocfs2-1.2-cert/patches/leave-other-dead-nodes-on-recovery-list.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/leave-other-dead-nodes-on-recovery-list.patch	2006-03-28 02:36:20 UTC (rev 2795)
+++ branches/ocfs2-1.2-cert/patches/leave-other-dead-nodes-on-recovery-list.patch	2006-03-28 19:27:56 UTC (rev 2796)
@@ -1,39 +0,0 @@
-Index: ocfs2-1.2/fs/ocfs2/dlm/dlmrecovery.c
-===================================================================
---- ocfs2-1.2.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-03-24 16:47:23.774339000 -0800
-+++ ocfs2-1.2/fs/ocfs2/dlm/dlmrecovery.c	2006-03-24 16:48:04.772260000 -0800
-@@ -1992,14 +1992,23 @@ static void dlm_finish_local_lockres_rec
- 		bucket = &(dlm->lockres_hash[i]);
- 		hlist_for_each_entry(res, hash_iter, bucket, hash_node) {
- 			if (res->state & DLM_LOCK_RES_RECOVERING) {
-+				mlog(ML_NOTICE,
-+				     "Continue!  owner = %u, dead_node = %u, this = %u, name = %.*s\n",
-+				     res->owner, dead_node,
-+				     dlm->node_num,
-+				     res->lockname.len,
-+				     res->lockname.name);
-+				continue;
-+
-+				/* The rest of this is a bug */
- 				if (res->owner == dead_node) {
--					mlog(0, "(this=%u) res %.*s owner=%u "
-+					mlog(ML_NOTICE, "(this=%u) res %.*s owner=%u "
- 					     "was not on recovering list, but "
- 					     "clearing state anyway\n",
- 					     dlm->node_num, res->lockname.len,
- 					     res->lockname.name, new_master);
- 				} else if (res->owner == dlm->node_num) {
--					mlog(0, "(this=%u) res %.*s owner=%u "
-+					mlog(ML_NOTICE, "(this=%u) res %.*s owner=%u "
- 					     "was not on recovering list, "
- 					     "owner is THIS node, clearing\n",
- 					     dlm->node_num, res->lockname.len,
-@@ -2008,7 +2017,7 @@ static void dlm_finish_local_lockres_rec
- 					continue;
- 
- 				if (!list_empty(&res->recovering)) {
--					mlog(0, "%s:%.*s: lockres was "
-+					mlog(ML_NOTICE, "%s:%.*s: lockres was "
- 					     "marked RECOVERING, owner=%u\n",
- 					     dlm->name, res->lockname.len,
- 					     res->lockname.name, res->owner);

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-03-28 02:36:20 UTC (rev 2795)
+++ branches/ocfs2-1.2-cert/patches/series	2006-03-28 19:27:56 UTC (rev 2796)
@@ -13,9 +13,7 @@
 lvb-recovery-fix.patch -p0
 mar24-create-lock-handler.patch -p0
 mastery-restart-recovery.patch -p0
-leave-other-dead-nodes-on-recovery-list.patch 
 hold-dirty-ref.patch
 fix-recovery-spin.patch
 fix-dlmlock_remote.patch
 ocfs2_heartbeat-better_I_O_error_handling.patch -p0
-silence-reco-msg.patch 

Deleted: branches/ocfs2-1.2-cert/patches/silence-reco-msg.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/silence-reco-msg.patch	2006-03-28 02:36:20 UTC (rev 2795)
+++ branches/ocfs2-1.2-cert/patches/silence-reco-msg.patch	2006-03-28 19:27:56 UTC (rev 2796)
@@ -1,13 +0,0 @@
-Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c
-===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c	2006-03-27 18:34:10.469009000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c	2006-03-27 18:35:02.382491000 -0800
-@@ -1992,7 +1992,7 @@ static void dlm_finish_local_lockres_rec
- 		bucket = &(dlm->lockres_hash[i]);
- 		hlist_for_each_entry(res, hash_iter, bucket, hash_node) {
- 			if (res->state & DLM_LOCK_RES_RECOVERING) {
--				mlog(ML_NOTICE,
-+				mlog(0,
- 				     "Continue!  owner = %u, dead_node = %u, this = %u, name = %.*s\n",
- 				     res->owner, dead_node,
- 				     dlm->node_num,