From d6763552ae1d46837754d5cd8c9e2da2270a9ecd Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 28 Jul 2014 21:32:30 -0700 Subject: [PATCH] LU-5339 tests: Un-duplicate test_24 and skip if MDS is 2.5.2 or older Un-duplicate test_24 and disable the test if MDS version is 2.5.2 or older. Change-Id: I3564c44a21bf149baf09294d42edd1529179736a Signed-off-by: Wei Liu Reviewed-on: http://review.whamcloud.com/11262 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/tests/replay-dual.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index 7ea4846..2d1a511 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -862,6 +862,9 @@ test_23d () { run_test 23d "c1 rmdir d1, M0 drop update reply and fail M0/M1, c2 mkdir d1" test_24 () { + [[ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.5.2) ]] || + { skip "Need MDS version newer than 2.5.2"; return 0; } + touch $MOUNT/$tfile stat $MOUNT/$tfile >&/dev/null # OBD_FAIL_MDS_REINT_NET_REP @@ -880,7 +883,7 @@ run_test 24 "reconstruct on non-existing object" # end commit on sharing tests -test_24() { +test_25() { cancel_lru_locks osc $SETSTRIPE -i 0 -c 1 $DIR/$tfile @@ -904,7 +907,7 @@ test_24() { killall multiop wait } -run_test 24 "replay|resend" +run_test 25 "replay|resend" complete $SECONDS SLEEP=$((`date +%s` - $NOW)) -- 1.8.3.1