From 99b0b5bc3fe5a566d73ed2eed53137f97d684e84 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sun, 13 Jan 2019 10:01:31 -0800 Subject: [PATCH] ZTS: zpool_resilver_restart Since the vdev initialize feature was integrated the ZTS zpool_resilver_restart test has been hitting its internal timeout more frequently. This happens most often on the coverage builder but not exclusively. Increasing the timeout for this test case prevents any false positives. Signed-off-by: Brian Behlendorf Closes #8273 --- .../functional/cli_root/zpool_resilver/zpool_resilver.cfg | 2 +- .../cli_root/zpool_resilver/zpool_resilver_restart.ksh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver.cfg index 5c013c7232..2a942d69f6 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver.cfg @@ -27,4 +27,4 @@ export DISK1=$(echo $DISKS | nawk '{print $1}') export DISK2=$(echo $DISKS | nawk '{print $2}') export DISK3=$(echo $DISKS | nawk '{print $3}') -export MAXTIMEOUT=80 +export MAXTIMEOUT=300 diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_restart.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_restart.ksh index 4f98ced960..cfafbb6b54 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_restart.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_restart.ksh @@ -33,7 +33,7 @@ # "Verify 'zpool resilver' restarts in-progress resilvers" # # STRATEGY: -# 1. Write some data and detatch the first drive so it has resilver +# 1. Write some data and detach the first drive so it has resilver # work to do # 2. Repeat the process with a second disk # 3. Reattach the drives, causing the second drive's resilver to be @@ -56,7 +56,7 @@ log_assert "Verify 'zpool resilver' restarts in-progress resilvers" mntpnt=$(get_prop mountpoint $TESTPOOL/$TESTFS) -# 1. Write some data and detatch the first drive so it has resilver work to do +# 1. Write some data and detach the first drive so it has resilver work to do log_must file_write -b 524288 -c 1024 -o create -d 0 -f $mntpnt/biggerfile1 log_must sync log_must zpool detach $TESTPOOL $DISK2