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>

diff --git a/common/fuzzy b/common/fuzzy
index 9a0456fafaf4560d780b4c62029b68d90b84f7da..b964fd8cb0fc0d0cab8629bb11c15a18e3e0a5b9 100644 (file)
--- 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"
                # 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}.")
                        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 67128b21093c6d2acfda89fbf6173466036bf254..e71b933c0056644539a220d489c08da24af49fc5 100755 (executable)
--- a/tests/xfs/286
+++ b/tests/xfs/286
@@ -1,7 +1,7 @@
 #! /bin/bash
 # FS QA Test No. 286
 #
 #! /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.
 #
 #-----------------------------------------------------------------------
 # 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
 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"
 done
 
 echo "Test done"