[Ocfs2-commits] khackel commits r2812 - branches/ocfs2-1.2-cert/patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Mon Apr 3 03:00:05 CDT 2006
Author: khackel
Signed-off-by: jlbec
Date: 2006-04-03 03:00:04 -0500 (Mon, 03 Apr 2006)
New Revision: 2812
Modified:
branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch
branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch
Log:
update tune-down-msgs and lame-timeout-dbg
Signed-off-by: jlbec
Modified: branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch 2006-04-03 07:45:59 UTC (rev 2811)
+++ branches/ocfs2-1.2-cert/patches/lame-timeout-dbg.patch 2006-04-03 08:00:04 UTC (rev 2812)
@@ -1,7 +1,7 @@
Index: cert2/fs/ocfs2/cluster/tcp.c
===================================================================
---- cert2.orig/fs/ocfs2/cluster/tcp.c 2006-04-02 23:16:18.812357000 -0700
-+++ cert2/fs/ocfs2/cluster/tcp.c 2006-04-02 23:21:53.636956000 -0700
+--- cert2.orig/fs/ocfs2/cluster/tcp.c 2006-04-03 00:53:05.670594000 -0700
++++ cert2/fs/ocfs2/cluster/tcp.c 2006-04-03 00:55:29.521430000 -0700
@@ -58,6 +58,7 @@
#include <linux/slab.h>
#include <linux/kref.h>
@@ -10,16 +10,24 @@
#include <asm/uaccess.h>
-@@ -1284,6 +1285,8 @@
+@@ -1284,6 +1285,16 @@
sc_put(sc);
}
+int lame_recovery_global = 0;
++void o2net_inc_lame_recovery_global()
++{
++ lame_recovery_global++;
++}
++void o2net_dec_lame_recovery_global()
++{
++ lame_recovery_global--;
++}
+
/* socket shutdown does a del_timer_sync against this as it tears down.
* we can't start this timer until we've got to the point in sc buildup
* where shutdown is going to be involved */
-@@ -1308,6 +1311,8 @@
+@@ -1308,6 +1319,8 @@
sc->sc_tv_func_start.tv_sec, sc->sc_tv_func_start.tv_usec,
sc->sc_tv_func_stop.tv_sec, sc->sc_tv_func_stop.tv_usec);
@@ -30,34 +38,38 @@
Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-02 23:16:18.944357000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-02 23:21:37.485233000 -0700
-@@ -53,6 +53,8 @@
- #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_RECOVERY)
- #include "cluster/masklog.h"
-
-+extern int lame_recovery_global;
-+
- static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node);
-
- static int dlm_recovery_thread(void *data);
-@@ -138,6 +140,7 @@
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 00:53:05.806594000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 00:56:39.716900000 -0700
+@@ -138,6 +138,7 @@
{
assert_spin_locked(&dlm->spinlock);
clear_bit(dlm->reco.dead_node, dlm->recovery_map);
-+ lame_recovery_global--;
++ o2net_dec_lame_recovery_global();
dlm_set_reco_dead_node(dlm, O2NM_INVALID_NODE_NUM);
dlm_set_reco_master(dlm, O2NM_INVALID_NODE_NUM);
}
-@@ -2287,8 +2290,10 @@
+@@ -2287,8 +2288,10 @@
if (test_bit(idx, dlm->recovery_map))
mlog(0, "domain %s, node %u already added "
"to recovery map!\n", dlm->name, idx);
- else
+ else {
set_bit(idx, dlm->recovery_map);
-+ lame_recovery_global++;
++ o2net_inc_lame_recovery_global();
+ }
}
void dlm_hb_node_down_cb(struct o2nm_node *node, int idx, void *data)
+Index: cert2/fs/ocfs2/cluster/tcp.h
+===================================================================
+--- cert2.orig/fs/ocfs2/cluster/tcp.h 2006-03-30 23:36:54.306659000 -0800
++++ cert2/fs/ocfs2/cluster/tcp.h 2006-04-03 00:55:49.827950000 -0700
+@@ -85,6 +85,8 @@
+ O2NET_DRIVER_READY,
+ };
+
++void o2net_dec_lame_recovery_global(void);
++void o2net_inc_lame_recovery_global(void);
+ int o2net_init_tcp_sock(struct inode *inode);
+ int o2net_send_message(u32 msg_type, u32 key, void *data, u32 len,
+ u8 target_node, int *status);
Modified: branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch 2006-04-03 07:45:59 UTC (rev 2811)
+++ branches/ocfs2-1.2-cert/patches/tune-down-msgs.patch 2006-04-03 08:00:04 UTC (rev 2812)
@@ -1,7 +1,7 @@
Index: cert2/fs/ocfs2/dlm/dlmlock.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmlock.c 2006-04-02 23:27:17.392139000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmlock.c 2006-04-03 00:26:03.376941000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmlock.c 2006-04-03 00:53:09.753310000 -0700
++++ cert2/fs/ocfs2/dlm/dlmlock.c 2006-04-03 00:56:52.804727000 -0700
@@ -232,7 +232,7 @@
/* recovery lock was mastered by dead node.
* we need to have calc_usage shoot down this
@@ -13,8 +13,8 @@
} else if (status != DLM_NOTQUEUED) {
Index: cert2/fs/ocfs2/dlm/dlmmaster.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-02 23:27:17.730079000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 00:32:55.480865000 -0700
+--- cert2.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 00:53:09.760313000 -0700
++++ cert2/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 00:56:52.818727000 -0700
@@ -834,7 +834,7 @@
* but they might own this lockres. wait on them. */
bit = find_next_bit(dlm->recovery_map, O2NM_MAX_NODES, 0);
@@ -223,9 +223,9 @@
/* if there is a lockres associated with this
Index: cert2/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
---- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-02 23:27:17.789020000 -0700
-+++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 00:42:08.148491000 -0700
-@@ -122,7 +122,7 @@
+--- cert2.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 00:56:39.716900000 -0700
++++ cert2/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 00:56:52.831727000 -0700
+@@ -120,7 +120,7 @@
{
assert_spin_locked(&dlm->spinlock);
if (dlm->reco.dead_node != dead_node)
@@ -234,7 +234,7 @@
dlm->name, dlm->reco.dead_node, dead_node);
dlm->reco.dead_node = dead_node;
}
-@@ -131,7 +131,7 @@
+@@ -129,7 +129,7 @@
u8 master)
{
assert_spin_locked(&dlm->spinlock);
@@ -243,7 +243,7 @@
dlm->name, dlm->reco.new_master, master);
dlm->reco.new_master = master;
}
-@@ -253,7 +253,7 @@
+@@ -251,7 +251,7 @@
struct dlm_reco_node_data *ndata;
struct dlm_lock_resource *res;
@@ -252,7 +252,7 @@
"dead=%u, master=%u\n", dlm->name,
dlm->dlm_reco_thread_task->pid,
dlm->reco.state & DLM_RECO_STATE_ACTIVE ? "ACTIVE" : "inactive",
-@@ -287,11 +287,11 @@
+@@ -285,11 +285,11 @@
st = "bad";
break;
}
@@ -266,7 +266,7 @@
dlm->name, res->lockname.len, res->lockname.name);
}
}
-@@ -362,13 +362,13 @@
+@@ -360,13 +360,13 @@
int dlm_wait_for_node_death(struct dlm_ctxt *dlm, u8 node, int timeout)
{
if (timeout) {
@@ -282,7 +282,7 @@
"of death of node %u\n", dlm->name, node);
wait_event(dlm->dlm_reco_thread_wq,
dlm_is_node_dead(dlm, node));
-@@ -380,13 +380,13 @@
+@@ -378,13 +378,13 @@
int dlm_wait_for_node_recovery(struct dlm_ctxt *dlm, u8 node, int timeout)
{
if (timeout) {
@@ -298,7 +298,7 @@
"of recovery of node %u\n", dlm->name, node);
wait_event(dlm->dlm_reco_thread_wq,
dlm_is_node_recovered(dlm, node));
-@@ -414,7 +414,7 @@
+@@ -412,7 +412,7 @@
void dlm_wait_for_recovery(struct dlm_ctxt *dlm)
{
if (dlm_in_recovery(dlm)) {
@@ -307,7 +307,7 @@
"state=%d, master=%u, dead=%u\n",
dlm->name, dlm->dlm_reco_thread_task->pid,
dlm->reco.state, dlm->reco.new_master,
-@@ -427,7 +427,7 @@
+@@ -425,7 +425,7 @@
!dlm_in_recovery(dlm),
msecs_to_jiffies(5000)))
break;
@@ -316,7 +316,7 @@
"state=%d, master=%u, dead=%u\n",
dlm->name, dlm->dlm_reco_thread_task->pid,
dlm->reco.state, dlm->reco.new_master,
-@@ -493,7 +493,7 @@
+@@ -491,7 +491,7 @@
/* return to main thread loop and sleep. */
return 0;
}
@@ -325,7 +325,7 @@
dlm->name, dlm->dlm_reco_thread_task->pid,
dlm->reco.dead_node);
spin_unlock(&dlm->spinlock);
-@@ -517,7 +517,7 @@
+@@ -515,7 +515,7 @@
}
mlog(0, "another node will master this recovery session.\n");
}
@@ -334,7 +334,7 @@
dlm->name, dlm->dlm_reco_thread_task->pid, dlm->reco.new_master,
dlm->node_num, dlm->reco.dead_node);
-@@ -530,21 +530,21 @@
+@@ -528,21 +528,21 @@
return 0;
master_here:
@@ -359,7 +359,7 @@
dlm->name, dlm->reco.dead_node, dlm->node_num);
dlm_reset_recovery(dlm);
}
-@@ -562,7 +562,6 @@
+@@ -560,7 +560,6 @@
int all_nodes_done;
int destroy = 0;
int pass = 0;
@@ -367,7 +367,7 @@
do {
/* we have become recovery master. there is no escaping
-@@ -611,7 +610,7 @@
+@@ -609,7 +608,7 @@
"yes" : "no");
} else {
/* -ENOMEM on the other node */
@@ -376,7 +376,7 @@
"%d during recovery, retrying "
"after a short wait\n",
dlm->name, ndata->node_num,
-@@ -628,7 +627,7 @@
+@@ -626,7 +625,7 @@
BUG();
break;
case DLM_RECO_NODE_DATA_DEAD:
@@ -385,7 +385,7 @@
"requesting recovery info for node %u\n",
dlm->name, ndata->node_num, dead_node);
/* fine. don't need this node's info.
-@@ -685,13 +684,7 @@
+@@ -683,13 +682,7 @@
break;
case DLM_RECO_NODE_DATA_RECEIVING:
case DLM_RECO_NODE_DATA_REQUESTED:
@@ -400,7 +400,7 @@
dlm->name, ndata->node_num,
ndata->state==DLM_RECO_NODE_DATA_RECEIVING ?
"receiving" : "requested");
-@@ -728,7 +721,7 @@
+@@ -726,7 +719,7 @@
spin_unlock(&dlm->spinlock);
mlog(0, "should be done with recovery!\n");
@@ -409,7 +409,7 @@
"dead=%u, this=%u, new=%u\n", dlm->name,
jiffies, dlm->reco.dead_node,
dlm->node_num, dlm->reco.new_master);
-@@ -899,7 +892,7 @@
+@@ -897,7 +890,7 @@
reco_master = item->u.ral.reco_master;
mres = (struct dlm_migratable_lockres *)data;
@@ -418,7 +418,7 @@
dlm->name, dead_node, reco_master);
if (dead_node != dlm->reco.dead_node ||
-@@ -907,13 +900,13 @@
+@@ -905,13 +898,13 @@
/* worker could have been created before the recovery master
* died. if so, do not continue, but do not error. */
if (dlm->reco.new_master == O2NM_INVALID_NODE_NUM) {
@@ -434,7 +434,7 @@
"master=%u), request(dead=%u, master=%u)\n",
dlm->name, dlm->reco.dead_node,
dlm->reco.new_master, dead_node, reco_master);
-@@ -939,7 +932,7 @@
+@@ -937,7 +930,7 @@
DLM_MRES_RECOVERY);
if (ret < 0) {
mlog_errno(ret);
@@ -443,7 +443,7 @@
"recovery state for dead node %u\n", dlm->name,
reco_master, dead_node);
skip_all_done = 1;
-@@ -956,7 +949,7 @@
+@@ -954,7 +947,7 @@
ret = dlm_send_all_done_msg(dlm, dead_node, reco_master);
if (ret < 0) {
mlog_errno(ret);
@@ -452,7 +452,7 @@
"recovery all-done for dead node %u\n", dlm->name,
reco_master, dead_node);
}
-@@ -974,7 +967,7 @@
+@@ -972,7 +965,7 @@
memset(&done_msg, 0, sizeof(done_msg));
done_msg.node_idx = dlm->node_num;
done_msg.dead_node = dead_node;
@@ -461,7 +461,7 @@
"my node=%u, dead node=%u\n", send_to, done_msg.node_idx,
done_msg.dead_node);
-@@ -1285,11 +1278,11 @@
+@@ -1283,11 +1276,11 @@
return ret;
error:
@@ -475,7 +475,7 @@
"lockres %.*s\n", dlm->name, send_to,
flags & DLM_MRES_RECOVERY ? "recovery" : "migration",
res->lockname.len, res->lockname.name);
-@@ -2237,13 +2230,13 @@
+@@ -2235,13 +2228,13 @@
assert_spin_locked(&dlm->spinlock);
if (dlm->reco.new_master == idx) {
@@ -491,7 +491,7 @@
"finalize1 state, clearing\n", dlm->name, idx);
dlm->reco.state &= ~DLM_RECO_STATE_FINALIZE;
__dlm_reset_recovery(dlm);
-@@ -2377,7 +2370,7 @@
+@@ -2375,7 +2368,7 @@
struct dlm_lockstatus lksb;
int status = -EINVAL;
@@ -500,7 +500,7 @@
dlm->name, jiffies, dlm->reco.dead_node, dlm->node_num);
again:
memset(&lksb, 0, sizeof(lksb));
-@@ -2385,17 +2378,17 @@
+@@ -2383,17 +2376,17 @@
ret = dlmlock(dlm, LKM_EXMODE, &lksb, LKM_NOQUEUE|LKM_RECOVERY,
DLM_RECOVERY_LOCK_NAME, dlm_reco_ast, dlm, dlm_reco_bast);
@@ -521,7 +521,7 @@
"do the recovery\n", dlm->name,
dlm->reco.new_master);
status = -EEXIST;
-@@ -2406,7 +2399,7 @@
+@@ -2404,7 +2397,7 @@
spin_lock(&dlm->spinlock);
if (dlm->reco.dead_node == O2NM_INVALID_NODE_NUM) {
status = -EINVAL;
@@ -530,7 +530,7 @@
"node got recovered already\n", dlm->name);
if (dlm->reco.new_master != O2NM_INVALID_NODE_NUM) {
mlog(ML_ERROR, "%s: new master is %u "
-@@ -2421,7 +2414,7 @@
+@@ -2419,7 +2412,7 @@
/* if this node has actually become the recovery master,
* set the master and send the messages to begin recovery */
if (!status) {
@@ -539,7 +539,7 @@
"begin_reco now\n", dlm->name,
dlm->reco.dead_node, dlm->node_num);
status = dlm_send_begin_reco_message(dlm,
-@@ -2452,7 +2445,7 @@
+@@ -2450,7 +2443,7 @@
mlog(ML_ERROR, "dlmunlock returned %d\n", ret);
}
} else if (ret == DLM_NOTQUEUED) {
@@ -548,7 +548,7 @@
dlm->name, dlm->node_num);
/* another node is master. wait on
* reco.new_master != O2NM_INVALID_NODE_NUM
-@@ -2461,16 +2454,16 @@
+@@ -2459,16 +2452,16 @@
dlm_reco_master_ready(dlm),
msecs_to_jiffies(1000));
if (!dlm_reco_master_ready(dlm)) {
@@ -568,7 +568,7 @@
dlm->name, dlm->node_num);
goto again;
} else {
-@@ -2504,7 +2497,7 @@
+@@ -2502,7 +2495,7 @@
mlog_entry("%u\n", dead_node);
@@ -577,7 +577,7 @@
spin_lock(&dlm->spinlock);
dlm_node_iter_init(dlm->domain_map, &iter);
-@@ -2548,7 +2541,7 @@
+@@ -2546,7 +2539,7 @@
/* this is now a serious problem, possibly ENOMEM
* in the network stack. must retry */
mlog_errno(ret);
@@ -586,7 +586,7 @@
" returned %d\n", dlm->name, nodenum, ret);
res = dlm_lookup_lockres(dlm, DLM_RECOVERY_LOCK_NAME,
DLM_RECOVERY_LOCK_NAME_LEN);
-@@ -2556,14 +2549,14 @@
+@@ -2554,14 +2547,14 @@
dlm_print_one_lock_resource(res);
dlm_lockres_put(res);
} else {
@@ -603,7 +603,7 @@
"%u, but node %u is waiting for last recovery "
"to complete, backoff for a bit\n", dlm->name,
dead_node, nodenum);
-@@ -2586,7 +2579,7 @@
+@@ -2584,7 +2577,7 @@
spin_lock(&dlm->spinlock);
if (dlm->reco.state & DLM_RECO_STATE_FINALIZE) {
@@ -612,7 +612,7 @@
"but this node is in finalize state, waiting on finalize2\n",
dlm->name, br->node_idx, br->dead_node,
dlm->reco.dead_node, dlm->reco.new_master);
-@@ -2595,7 +2588,7 @@
+@@ -2593,7 +2586,7 @@
}
spin_unlock(&dlm->spinlock);
@@ -621,7 +621,7 @@
dlm->name, br->node_idx, br->dead_node,
dlm->reco.dead_node, dlm->reco.new_master);
-@@ -2615,7 +2608,7 @@
+@@ -2613,7 +2606,7 @@
}
}
if (dlm->reco.dead_node != O2NM_INVALID_NODE_NUM) {
@@ -630,7 +630,7 @@
"node %u changing it to %u\n", dlm->name,
dlm->reco.dead_node, br->node_idx, br->dead_node);
}
-@@ -2640,7 +2633,7 @@
+@@ -2638,7 +2631,7 @@
dlm_kick_recovery_thread(dlm);
@@ -639,7 +639,7 @@
dlm->name, br->node_idx, br->dead_node,
dlm->reco.dead_node, dlm->reco.new_master);
-@@ -2658,7 +2651,7 @@
+@@ -2656,7 +2649,7 @@
int status;
int stage = 1;
@@ -648,7 +648,7 @@
"stage %d\n", dlm->name, dlm->reco.dead_node, stage);
spin_lock(&dlm->spinlock);
-@@ -2685,7 +2678,7 @@
+@@ -2683,7 +2676,7 @@
/* this has no effect on this recovery
* session, so set the status to zero to
* finish out the last recovery */
@@ -657,7 +657,7 @@
"node finished recovery.\n", nodenum);
ret = 0;
continue;
-@@ -2716,7 +2709,7 @@
+@@ -2714,7 +2707,7 @@
if (fr->flags & DLM_FINALIZE_STAGE2)
stage = 2;
@@ -666,7 +666,7 @@
"node %u (%u:%u)\n", dlm->name, fr->node_idx, stage,
fr->dead_node, dlm->reco.dead_node, dlm->reco.new_master);
-@@ -2767,7 +2760,7 @@
+@@ -2765,7 +2758,7 @@
BUG();
}
More information about the Ocfs2-commits
mailing list