From: Alex Zhuravlev Date: Fri, 19 Apr 2019 12:01:12 +0000 (+0300) Subject: LU-12195 tests: use sleep instead of wrapped multiop X-Git-Tag: 2.12.53~9 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9a1f327a76f72c7713e53d8b354ff7f0e32be870 LU-12195 tests: use sleep instead of wrapped multiop in sanity/43* and sanity/14* tests as multiop is not a binary, but libtool-wrapped script. the tests fail when started from a build tree. Change-Id: Iaec3433f03aab23583052373e5f0252d9eac7f04 Signed-off-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/34721 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index c60de09..1996346 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -4156,15 +4156,11 @@ run_test 43A "execution of file opened for write should return -ETXTBSY" test_43a() { test_mkdir $DIR/$tdir - cp -p $(which $MULTIOP) $DIR/$tdir/multiop || - cp -p multiop $DIR/$tdir/multiop - MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/$tfile.junk O_c || - error "multiop open $TMP/$tfile.junk failed" - rm $TMP/$tfile.junk # delete junk file on close (not part of test) - MULTIOP_PID=$! - $MULTIOP $DIR/$tdir/multiop Oc && error "expected error, got success" - kill -USR1 $MULTIOP_PID || error "kill -USR1 PID $MULTIOP_PID failed" - wait $MULTIOP_PID || error "wait PID $MULTIOP_PID failed" + cp -p $(which sleep) $DIR/$tdir/sleep || error "can't copy" + $DIR/$tdir/sleep 60 & + SLEEP_PID=$! + $MULTIOP $DIR/$tdir/sleep Oc && error "expected error, got success" + kill $SLEEP_PID } run_test 43a "open(RDWR) of file being executed should return -ETXTBSY" @@ -4172,15 +4168,11 @@ test_43b() { [ $PARALLEL == "yes" ] && skip "skip parallel run" test_mkdir $DIR/$tdir - cp -p $(which $MULTIOP) $DIR/$tdir/multiop || - cp -p multiop $DIR/$tdir/multiop - MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/$tfile.junk O_c || - error "multiop open $TMP/$tfile.junk failed" - rm $TMP/$tfile.junk # delete junk file on close (not part of test) - MULTIOP_PID=$! - $TRUNCATE $DIR/$tdir/multiop 0 && error "expected error, got success" - kill -USR1 $MULTIOP_PID || error "kill -USR1 PID $MULTIOP_PID failed" - wait $MULTIOP_PID || error "wait PID $MULTIOP_PID failed" + cp -p $(which sleep) $DIR/$tdir/sleep || error "can't copy" + $DIR/$tdir/sleep 60 & + SLEEP_PID=$! + $TRUNCATE $DIR/$tdir/sleep 0 && error "expected error, got success" + kill $SLEEP_PID } run_test 43b "truncate of file being executed should return -ETXTBSY" diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 94707e3..789e614 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -317,65 +317,52 @@ test_14aa() { MULTIPID=$! $DIR2/$tdir/$tfile && error || true - kill -USR1 $MULTIPID - wait $MULTIPID || return 2 + kill $MULTIPID } run_test 14aa "execution of file open for write returns -ETXTBSY" test_14ab() { test_mkdir $DIR1/$tdir - cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed" - MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c || - return 1 - MULTIOP_PID=$! - $MULTIOP $DIR2/$tdir/multiop Oc && error "expected error, got success" - kill -USR1 $MULTIOP_PID || return 2 - wait $MULTIOP_PID || return 3 - rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop" + cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed" + $DIR1/$tdir/sleep 60 & + SLEEP_PID=$! + $MULTIOP $DIR2/$tdir/sleep Oc && error "expected error, got success" + kill $SLEEP_PID } run_test 14ab "open(RDWR) of executing file returns -ETXTBSY" test_14b() { # bug 3192, 7040 test_mkdir $DIR1/$tdir - cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed" - MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c || - return 1 - MULTIOP_PID=$! - $TRUNCATE $DIR2/$tdir/multiop 0 && kill -9 $MULTIOP_PID && \ + cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed" + $DIR1/$tdir/sleep 60 & + SLEEP_PID=$! + $TRUNCATE $DIR2/$tdir/sleep 60 && kill -9 $SLEEP_PID && \ error "expected truncate error, got success" - kill -USR1 $MULTIOP_PID || return 2 - wait $MULTIOP_PID || return 3 - cmp $(which multiop) $DIR1/$tdir/multiop || error "binary changed" - rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop" + kill $SLEEP_PID + cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed" } run_test 14b "truncate of executing file returns -ETXTBSY ======" test_14c() { # bug 3430, 7040 test_mkdir $DIR1/$tdir - cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed" - MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c || - return 1 - MULTIOP_PID=$! - cp /etc/hosts $DIR2/$tdir/multiop && error "expected error, got success" - kill -USR1 $MULTIOP_PID || return 2 - wait $MULTIOP_PID || return 3 - cmp $(which multiop) $DIR1/$tdir/multiop || error "binary changed" - rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop" + cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed" + $DIR1/$tdir/sleep 60 & + SLEEP_PID=$! + cp /etc/hosts $DIR2/$tdir/sleep && error "expected error, got success" + kill $SLEEP_PID + cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed" } run_test 14c "open(O_TRUNC) of executing file return -ETXTBSY ==" test_14d() { # bug 10921 test_mkdir $DIR1/$tdir - cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed" - MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c || - return 1 - MULTIOP_PID=$! + cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed" + $DIR1/$tdir/sleep 60 & + SLEEP_PID=$! log chmod - chmod 600 $DIR1/$tdir/multiop || error "chmod failed" - kill -USR1 $MULTIOP_PID || return 2 - wait $MULTIOP_PID || return 3 - cmp $(which multiop) $DIR1/$tdir/multiop || error "binary changed" - rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop" + chmod 600 $DIR1/$tdir/sleep || error "chmod failed" + kill $SLEEP_PID + cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed" } run_test 14d "chmod of executing file is still possible ========"