diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-02-07 13:19:24 -0800 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2018-02-08 20:49:11 +0800 |
| commit | 66f7b4c2ce14def251b69539a3e4798ea89f3402 (patch) | |
| tree | 3ff1ccad972063a2663d6eaa9c43b00e66d75fc2 | |
| parent | f03cfe78dac0750b1084216e3d5e4c46e0d337e8 (diff) | |
| download | xfstests-66f7b4c2ce14def251b69539a3e4798ea89f3402.tar.gz | |
xfs_scrub: remove -y parameter
Remove the -y parameter from scrub runs since we're removing that
option from xfs_scrub.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
| -rw-r--r-- | common/fuzzy | 2 | ||||
| -rwxr-xr-x | tests/xfs/286 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/fuzzy b/common/fuzzy index 9a0456fafa..b964fd8cb0 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -216,7 +216,7 @@ __scratch_xfs_fuzz_field_test() { # Try fixing the filesystem online?! if [ "${repair}" = "online" ] || [ "${repair}" = "both" ]; then __fuzz_notify "++ Try to repair filesystem online" - _scratch_scrub -y 2>&1 + _scratch_scrub 2>&1 res=$? test $res -ne 0 && \ (>&2 echo "online repair failed ($res) with ${field} = ${fuzzverb}.") diff --git a/tests/xfs/286 b/tests/xfs/286 index 67128b2109..e71b933c00 100755 --- a/tests/xfs/286 +++ b/tests/xfs/286 @@ -1,7 +1,7 @@ #! /bin/bash # FS QA Test No. 286 # -# Race fio and xfs_scrub -y for a while to see if we crash or livelock. +# Race fio and xfs_scrub for a while to see if we crash or livelock. # #----------------------------------------------------------------------- # Copyright (c) 2017 Oracle, Inc. All Rights Reserved. @@ -75,7 +75,7 @@ end=$((start + (60 * TIME_FACTOR) )) killstress & echo "Repair started at $(date --date="@${start}"), ending at $(date --date="@${end}")" >> $seqres.full while [ "$(date +%s)" -lt "$end" ]; do - XFS_SCRUB_FORCE_REPAIR=1 $TIMEOUT_PROG -s TERM $(( end - $(date +%s) + 2 )) $XFS_SCRUB_PROG -d -T -v -y $SCRATCH_MNT >> $seqres.full + XFS_SCRUB_FORCE_REPAIR=1 $TIMEOUT_PROG -s TERM $(( end - $(date +%s) + 2 )) $XFS_SCRUB_PROG -d -T -v $SCRATCH_MNT >> $seqres.full done echo "Test done" |