From e2eda050f28e44210dc1da685aa97477c3c719b1 Mon Sep 17 00:00:00 2001 From: tappro Date: Wed, 22 Apr 2009 20:27:40 +0000 Subject: [PATCH] - don't cleanup namespace during lock replay, that may lead to deadlocks b:18946 i:shadow,johann --- lustre/ptlrpc/client.c | 4 ---- lustre/tests/replay-vbr.sh | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index ceb8b34..6310b26 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -2169,7 +2169,6 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req, DEBUG_REQ(D_WARNING, req, "Version mismatch during replay\n"); spin_lock(&imp->imp_lock); imp->imp_vbr_failed = 1; - imp->imp_no_lock_replay = 1; spin_unlock(&imp->imp_lock); } else { /* The transno had better not change over replay. */ @@ -2179,9 +2178,6 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req, } spin_lock(&imp->imp_lock); - /* if replays by version then gap was occur on server, no trust to locks */ - if (lustre_msg_get_flags(req->rq_repmsg) & MSG_VERSION_REPLAY) - imp->imp_no_lock_replay = 1; imp->imp_last_replay_transno = lustre_msg_get_transno(req->rq_reqmsg); spin_unlock(&imp->imp_lock); LASSERT(imp->imp_last_replay_transno); diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh index f4ffeb3..b4bcc46 100644 --- a/lustre/tests/replay-vbr.sh +++ b/lustre/tests/replay-vbr.sh @@ -2,8 +2,8 @@ set -e -# bug number: -ALWAYS_EXCEPT="3c 4b 4c 10 $REPLAY_VBR_EXCEPT" +# bug number: 18946 +ALWAYS_EXCEPT="2 3c 4b 4c 10 $REPLAY_VBR_EXCEPT" SAVE_PWD=$PWD PTLDEBUG=${PTLDEBUG:--1} @@ -74,7 +74,6 @@ test_2() { replay_barrier mds do_node $CLIENT2 mcreate $DIR/$tdir/$tfile do_node $CLIENT1 createmany -o $DIR/$tfile- 25 - #do_node $CLIENT2 createmany -o $DIR/$tdir/$tfile-2- 1 do_node $CLIENT1 $CHECKSTAT $DIR/$tdir/$tfile do_node $CLIENT1 createmany -o $DIR/$tfile-3- 25 zconf_umount $CLIENT2 $DIR -- 1.8.3.1