[Ocfs2-commits] khackel commits r2827 - branches/ocfs2-1.2-cert/patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Thu Apr 6 13:10:57 CDT 2006
Author: khackel
Signed-off-by: jlbec
Date: 2006-04-06 13:10:56 -0500 (Thu, 06 Apr 2006)
New Revision: 2827
Modified:
branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes
branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs
branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch
Log:
change wait_event in dlm work thread to not timeout
Signed-off-by: jlbec
Modified: branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch 2006-04-06 17:54:18 UTC (rev 2826)
+++ branches/ocfs2-1.2-cert/patches/debug-bad-recovery.patch 2006-04-06 18:10:56 UTC (rev 2827)
@@ -1,7 +1,7 @@
Index: cert2/fs/ocfs2/dlm/dlmconvert.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmconvert.c 2006-04-05 20:42:53.211199000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmconvert.c 2006-04-05 20:50:14.257882000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmconvert.c 2006-04-06 10:57:56.559041000 -0700
++++ cert2/fs/ocfs2/dlm/dlmconvert.c 2006-04-06 11:02:17.272259000 -0700
@@ -467,6 +467,12 @@
}
@@ -38,9 +38,9 @@
status = DLM_IVLOCKID;
Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-05 20:42:54.816878000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-05 20:42:55.061699000 -0700
-@@ -488,7 +488,7 @@
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-06 11:00:52.775544000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-06 11:02:17.298259000 -0700
+@@ -485,7 +485,7 @@
dlm->reco.dead_node);
//dlm_print_reco_junk(dlm);
}
@@ -49,7 +49,7 @@
while (1) {
if (wait_event_timeout(dlm->reco.event,
!dlm_in_recovery(dlm),
-@@ -501,7 +501,8 @@
+@@ -498,7 +498,8 @@
dlm->reco.dead_node);
//dlm_print_reco_junk(dlm);
}
@@ -59,7 +59,7 @@
}
static void dlm_begin_recovery(struct dlm_ctxt *dlm)
-@@ -752,12 +753,11 @@ static int dlm_remaster_locks(struct dlm
+@@ -749,12 +750,11 @@
break;
case DLM_RECO_NODE_DATA_RECEIVING:
case DLM_RECO_NODE_DATA_REQUESTED:
@@ -76,11 +76,11 @@
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
+Index: cert2/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:
+--- cert2.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-06 10:57:56.705021000 -0700
++++ cert2/fs/ocfs2/dlm/dlmmaster.c 2006-04-06 11:02:17.314259000 -0700
+@@ -1694,13 +1694,13 @@
tmpret = o2net_send_message(DLM_ASSERT_MASTER_MSG, dlm->key,
&assert, sizeof(assert), to, &r);
if (tmpret < 0) {
@@ -97,7 +97,7 @@
/* any nonzero status return will do */
ret = tmpret;
} else if (r < 0) {
-@@ -2086,7 +2086,8 @@ void dlm_assert_master_worker(struct dlm
+@@ -2086,7 +2086,8 @@
nodemap, flags);
if (ret < 0) {
/* no need to restart, we are done */
@@ -107,7 +107,7 @@
}
/* Ok, we've asserted ourselves. Let's let migration start. */
-@@ -2861,7 +2862,7 @@ top:
+@@ -2861,7 +2862,7 @@
* may result in the mle being unlinked and
* freed, but there may still be a process
* waiting in the dlmlock path which is fine. */
Modified: branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes
===================================================================
--- branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes 2006-04-06 17:54:18 UTC (rev 2826)
+++ branches/ocfs2-1.2-cert/patches/hb-add_tracking_around_configured_nodes 2006-04-06 18:10:56 UTC (rev 2827)
@@ -1,7 +1,7 @@
Index: cert2/fs/ocfs2/cluster/heartbeat.c
===================================================================
---- cert2.orig/fs/ocfs2/cluster/heartbeat.c 2006-04-04 13:03:31.011691000 -0700
-+++ cert2/fs/ocfs2/cluster/heartbeat.c 2006-04-04 13:06:14.702310000 -0700
+--- cert2.orig/fs/ocfs2/cluster/heartbeat.c 2006-04-06 10:58:02.886917000 -0700
++++ cert2/fs/ocfs2/cluster/heartbeat.c 2006-04-06 11:02:07.746469000 -0700
@@ -931,12 +931,14 @@
struct o2hb_bio_wait_ctxt write_wc;
struct timeval start;
Modified: branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs
===================================================================
--- branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs 2006-04-06 17:54:18 UTC (rev 2826)
+++ branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs 2006-04-06 18:10:56 UTC (rev 2827)
@@ -1,7 +1,7 @@
-Index: ocfs2-1.2-cert/fs/ocfs2/extent_map.c
+Index: cert2/fs/ocfs2/extent_map.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/extent_map.c 2006-04-04 13:20:25.271468000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/extent_map.c 2006-04-04 13:20:34.540316000 -0700
+--- cert2.orig/fs/ocfs2/extent_map.c 2006-04-06 10:57:58.833253000 -0700
++++ cert2/fs/ocfs2/extent_map.c 2006-04-06 11:02:14.033370000 -0700
@@ -581,7 +581,7 @@
ret = -ENOMEM;
@@ -28,10 +28,10 @@
if (!ctxt.right_ent)
break;
}
-Index: ocfs2-1.2-cert/fs/ocfs2/journal.c
+Index: cert2/fs/ocfs2/journal.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/journal.c 2006-04-04 13:20:26.513905000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/journal.c 2006-04-04 13:20:34.559307000 -0700
+--- cert2.orig/fs/ocfs2/journal.c 2006-04-06 10:57:58.905181000 -0700
++++ cert2/fs/ocfs2/journal.c 2006-04-06 11:02:14.053350000 -0700
@@ -117,7 +117,7 @@
{
struct ocfs2_journal_handle *retval = NULL;
@@ -50,10 +50,10 @@
if (!item) {
/* Though we wish to avoid it, we are in fact safe in
* skipping local alloc cleanup as fsck.ocfs2 is more
-Index: ocfs2-1.2-cert/fs/ocfs2/cluster/nodemanager.c
+Index: cert2/fs/ocfs2/cluster/nodemanager.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/nodemanager.c 2006-03-27 14:36:35.530640000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/cluster/nodemanager.c 2006-04-04 13:20:34.575307000 -0700
+--- cert2.orig/fs/ocfs2/cluster/nodemanager.c 2006-04-06 10:57:58.977108000 -0700
++++ cert2/fs/ocfs2/cluster/nodemanager.c 2006-04-06 11:02:14.063340000 -0700
@@ -550,7 +550,7 @@
if (strlen(name) > O2NM_MAX_NAME_LEN)
goto out; /* ENAMETOOLONG */
@@ -76,10 +76,10 @@
o2hb_group = o2hb_alloc_hb_set();
if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
goto out;
-Index: ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c
+Index: cert2/fs/ocfs2/cluster/heartbeat.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/heartbeat.c 2006-04-04 13:20:34.283573000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c 2006-04-04 13:20:34.591307000 -0700
+--- cert2.orig/fs/ocfs2/cluster/heartbeat.c 2006-04-06 11:02:07.746469000 -0700
++++ cert2/fs/ocfs2/cluster/heartbeat.c 2006-04-06 11:02:14.076327000 -0700
@@ -481,7 +481,7 @@
o2hb_compute_request_limits(reg, max_slots, &num_bios, &slots_per_bio);
@@ -141,10 +141,10 @@
if (hs == NULL)
goto out;
-Index: ocfs2-1.2-cert/fs/ocfs2/cluster/net_proc.c
+Index: cert2/fs/ocfs2/cluster/net_proc.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/net_proc.c 2006-04-04 13:20:31.969270000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/cluster/net_proc.c 2006-04-04 13:20:34.601307000 -0700
+--- cert2.orig/fs/ocfs2/cluster/net_proc.c 2006-04-06 10:57:59.122078000 -0700
++++ cert2/fs/ocfs2/cluster/net_proc.c 2006-04-06 11:02:14.083320000 -0700
@@ -156,7 +156,7 @@
struct seq_file *seq;
int ret;
@@ -163,10 +163,10 @@
if (dummy_sc == NULL) {
ret = -ENOMEM;
goto out;
-Index: ocfs2-1.2-cert/fs/ocfs2/vote.c
+Index: cert2/fs/ocfs2/vote.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/vote.c 2006-03-27 14:36:42.275400000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/vote.c 2006-04-04 13:20:34.615307000 -0700
+--- cert2.orig/fs/ocfs2/vote.c 2006-04-06 10:57:59.194080000 -0700
++++ cert2/fs/ocfs2/vote.c 2006-04-06 11:02:14.092311000 -0700
@@ -598,7 +598,7 @@
{
struct ocfs2_net_wait_ctxt *w;
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-06 17:54:18 UTC (rev 2826)
+++ branches/ocfs2-1.2-cert/patches/move-dlm-work-to-thread.patch 2006-04-06 18:10:56 UTC (rev 2827)
@@ -1,7 +1,7 @@
Index: cert2/fs/ocfs2/dlm/dlmcommon.h
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmcommon.h 2006-04-04 13:03:23.871937000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmcommon.h 2006-04-04 13:03:24.112937000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmcommon.h 2006-04-06 10:57:49.159287000 -0700
++++ cert2/fs/ocfs2/dlm/dlmcommon.h 2006-04-06 10:57:49.376287000 -0700
@@ -121,12 +121,13 @@
struct o2hb_callback_func dlm_hb_down;
struct task_struct *dlm_thread_task;
@@ -30,8 +30,8 @@
void dlm_put(struct dlm_ctxt *dlm);
Index: cert2/fs/ocfs2/dlm/dlmdomain.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-04 13:03:23.982938000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmdomain.c 2006-04-04 13:03:24.123937000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-06 10:57:49.265288000 -0700
++++ cert2/fs/ocfs2/dlm/dlmdomain.c 2006-04-06 10:57:49.387288000 -0700
@@ -290,6 +290,7 @@
dlm_unregister_domain_handlers(dlm);
dlm_complete_thread(dlm);
@@ -89,8 +89,8 @@
dlm->dlm_state = DLM_CTXT_NEW;
Index: cert2/fs/ocfs2/dlm/dlmmaster.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-04 13:03:24.037937000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmmaster.c 2006-04-04 13:03:24.140937000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-06 10:57:49.300287000 -0700
++++ cert2/fs/ocfs2/dlm/dlmmaster.c 2006-04-06 10:57:56.705021000 -0700
@@ -2018,7 +2018,7 @@
list_add_tail(&item->list, &dlm->work_list);
spin_unlock(&dlm->work_lock);
@@ -102,9 +102,9 @@
Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-04 13:03:23.962937000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-04 13:03:59.721534000 -0700
-@@ -149,6 +149,65 @@
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-06 10:57:49.245287000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-06 11:00:52.775544000 -0700
+@@ -149,6 +149,62 @@
spin_unlock(&dlm->spinlock);
}
@@ -143,11 +143,9 @@
+ }
+}
+
-+#define DLM_WORKER_TIMEOUT_MS (5 * 1000)
+static int dlm_worker_thread(void *data)
+{
+ struct dlm_ctxt *dlm = data;
-+ unsigned long timeout = msecs_to_jiffies(DLM_WORKER_TIMEOUT_MS);
+
+ mlog(0, "dlm worker thread running for %s...\n", dlm->name);
+
@@ -158,9 +156,8 @@
+ mlog(0, "%s: done with dlm_dispatch_work\n", dlm->name);
+ }
+
-+ wait_event_interruptible_timeout(dlm->dlm_worker_thread_wq,
-+ kthread_should_stop(),
-+ timeout);
++ wait_event_interruptible(dlm->dlm_worker_thread_wq,
++ kthread_should_stop());
+ }
+
+ mlog(0, "quitting DLM worker thread\n");
@@ -170,7 +167,7 @@
/* Worker function used during recovery. */
void dlm_dispatch_work(void *data)
{
-@@ -157,15 +216,22 @@
+@@ -157,15 +213,22 @@
struct list_head *iter, *iter2;
struct dlm_work_item *item;
dlm_workfunc_t *workfunc;
@@ -193,7 +190,7 @@
/* already have ref on dlm to avoid having
* it disappear. just double-check. */
-@@ -173,10 +239,14 @@
+@@ -173,10 +236,14 @@
/* this is allowed to sleep and
* call network stuff */
@@ -208,7 +205,7 @@
}
}
-@@ -874,7 +944,7 @@
+@@ -874,7 +941,7 @@
spin_lock(&dlm->work_lock);
list_add_tail(&item->list, &dlm->work_list);
spin_unlock(&dlm->work_lock);
@@ -217,7 +214,7 @@
dlm_put(dlm);
return 0;
-@@ -1429,7 +1499,7 @@
+@@ -1429,7 +1496,7 @@
spin_lock(&dlm->work_lock);
list_add_tail(&item->list, &dlm->work_list);
spin_unlock(&dlm->work_lock);
@@ -228,8 +225,8 @@
dlm_put(dlm);
Index: cert2/fs/ocfs2/dlm/dlmthread.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmthread.c 2006-04-04 13:03:23.250258000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmthread.c 2006-04-04 13:05:55.440466000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmthread.c 2006-04-06 10:57:48.595608000 -0700
++++ cert2/fs/ocfs2/dlm/dlmthread.c 2006-04-06 10:57:49.428287000 -0700
@@ -750,7 +750,7 @@
/* yield and continue right away if there is more work to do */
More information about the Ocfs2-commits
mailing list