From 9b63762c47732b8d3cb17935d528e0c0fad814db Mon Sep 17 00:00:00 2001 From: Yang Sheng Date: Thu, 15 Jun 2017 23:29:25 +0800 Subject: [PATCH] LU-2776 tests: waiting multiop finished in sanityn:51a The test would fail if multiop be delayed, So we should wait enough time for it finished. Signed-off-by: Yang Sheng Change-Id: I9a329857230e3c49a5c78017ed385f20b3554d98 Reviewed-on: https://review.whamcloud.com/27662 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Bob Glossman --- lustre/tests/sanityn.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 130bd7d..c22257e 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -33,8 +33,8 @@ init_test_env $@ init_logging if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then -# bug number for skipped test: LU-2776 - ALWAYS_EXCEPT="$ALWAYS_EXCEPT 51a" +# bug number for skipped test: + ALWAYS_EXCEPT="$ALWAYS_EXCEPT " # LU-2829 / LU-2887 - make allowances for ZFS slowness TEST33_NFILES=${TEST33_NFILES:-1000} fi @@ -2434,7 +2434,10 @@ test_51a() { error "dd $DIR1/$tfile failed" # MULTIOP proc should be able to read enough bytes and exit - sleep 2 + for ((i = 0; i < 6; i++)); do + sleep 1 + kill -0 $pid || break + done kill -0 $pid 2> /dev/null && error "multiop is still there" cmp $origfile $DIR2/$tfile || error "$origfile and $DIR2/$tfile differs" -- 1.8.3.1