apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: remove fio config files after finished test

Browse Source 
After finished test, temporarily fio config file should be removed.
This commit tries to fix this problem in the following test cases:
  - generic/299-300
  - ext4/301-304
  - shared/305

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Zheng Liu
2013-05-14 08:35:44 -05:00
committed by Rich Johnston
parent ef6b444461
commit 05aab5cf04
7 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ext4/301
+5 -4
View File
@@ -28,6 +28,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -49,7 +50,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
# reserve 30% in order to avoid ENOSPC # reserve 30% in order to avoid ENOSPC
FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1)))) FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1))))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
# Common e4defrag regression tests # Common e4defrag regression tests
[global] [global]
ioengine=ioe_e4defrag ioengine=ioe_e4defrag
@@ -101,11 +102,11 @@ _workout()
echo "" echo ""
echo " Start defragment activity" echo " Start defragment activity"
echo "" echo ""
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio run_check $FIO_PROG $fio_config
} }
_require_fio $tmp-$seq.fio _require_fio $fio_config
_scratch_mkfs >> $seqres.full 2>&1 _scratch_mkfs >> $seqres.full 2>&1
_scratch_mount _scratch_mount
tests/ext4/302
+5 -4
View File
@@ -29,6 +29,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -49,7 +50,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
# reserve 30% in order to avoid ENOSPC # reserve 30% in order to avoid ENOSPC
FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1)))) FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1))))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
# Common e4defrag regression tests # Common e4defrag regression tests
[global] [global]
ioengine=ioe_e4defrag ioengine=ioe_e4defrag
@@ -117,11 +118,11 @@ _workout()
echo "" echo ""
echo " Start defragment activity" echo " Start defragment activity"
echo "" echo ""
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio run_check $FIO_PROG $fio_config
} }
_require_fio $tmp-$seq.fio _require_fio $fio_config
_scratch_mkfs >> $seqres.full 2>&1 _scratch_mkfs >> $seqres.full 2>&1
_scratch_mount _scratch_mount
tests/ext4/303
+5 -4
View File
@@ -29,6 +29,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -49,7 +50,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
# Reserve space for 4 files in order to avoid ENOSPC # Reserve space for 4 files in order to avoid ENOSPC
FILE_SIZE=$((BLK_DEV_SIZE * (512 / (3+1)))) FILE_SIZE=$((BLK_DEV_SIZE * (512 / (3+1))))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
# Common e4defrag regression tests # Common e4defrag regression tests
[global] [global]
ioengine=ioe_e4defrag ioengine=ioe_e4defrag
@@ -127,11 +128,11 @@ _workout()
echo "" echo ""
echo " Start defragment activity" echo " Start defragment activity"
echo "" echo ""
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio run_check $FIO_PROG $fio_config
} }
_require_fio $tmp-$seq.fio _require_fio $fio_config
_scratch_mkfs >> $seqres.full 2>&1 _scratch_mkfs >> $seqres.full 2>&1
_scratch_mount _scratch_mount
tests/ext4/304
+5 -4
View File
@@ -30,6 +30,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -50,7 +51,7 @@ BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
# reserve 30% in order to avoid ENOSPC # reserve 30% in order to avoid ENOSPC
FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1)))) FILE_SIZE=$((BLK_DEV_SIZE * (512 / (2 + 1))))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
# Common e4defrag regression tests # Common e4defrag regression tests
[global] [global]
ioengine=ioe_e4defrag ioengine=ioe_e4defrag
@@ -104,11 +105,11 @@ _workout()
echo "" echo ""
echo " Start defragment activity" echo " Start defragment activity"
echo "" echo ""
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio run_check $FIO_PROG $fio_config
} }
_require_fio $tmp-$seq.fio _require_fio $fio_config
_scratch_mkfs >> $seqres.full 2>&1 _scratch_mkfs >> $seqres.full 2>&1
_scratch_mount _scratch_mount
tests/generic/299
+5 -4
View File
@@ -30,6 +30,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -47,7 +48,7 @@ NUM_JOBS=$((4*LOAD_FACTOR))
BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
FILE_SIZE=$((BLK_DEV_SIZE * 512)) FILE_SIZE=$((BLK_DEV_SIZE * 512))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
########### ###########
# $seq test fio activity # $seq test fio activity
# Filenames derived from jobsname and jobid like follows: # Filenames derived from jobsname and jobid like follows:
@@ -108,15 +109,15 @@ rw=randrw
filename=buffered-aio-verifier filename=buffered-aio-verifier
EOF EOF
_require_fio $tmp-$seq.fio _require_fio $fio_config
_workout() _workout()
{ {
echo "" echo ""
echo "Run fio with random aio-dio pattern" echo "Run fio with random aio-dio pattern"
echo "" echo ""
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio & run_check $FIO_PROG $fio_config &
pid=$! pid=$!
echo "Start fallocate/truncate loop" echo "Start fallocate/truncate loop"
tests/generic/300
+5 -4
View File
@@ -30,6 +30,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -51,7 +52,7 @@ then
fi fi
FS_SIZE=$((BLK_DEV_SIZE * 512)) FS_SIZE=$((BLK_DEV_SIZE * 512))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
########### ###########
# $seq test fio activity # $seq test fio activity
# Run DIO, fallocate and punch_hole threads on a single in parallel # Run DIO, fallocate and punch_hole threads on a single in parallel
@@ -128,11 +129,11 @@ _workout()
echo "" echo ""
echo "Run fio with random aio-dio pattern" echo "Run fio with random aio-dio pattern"
echo "" echo ""
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio run_check $FIO_PROG $fio_config
} }
_require_fio $tmp-$seq.fio _require_fio $fio_config
_scratch_mkfs_sized $FS_SIZE >> $seqres.full 2>&1 _scratch_mkfs_sized $FS_SIZE >> $seqres.full 2>&1
_scratch_mount _scratch_mount
tests/shared/305
+6 -4
View File
@@ -29,6 +29,7 @@ echo "QA output created by $seq"
here=`pwd` here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default! status=1 # failure is the default!
# get standard environment, filters and checks # get standard environment, filters and checks
@@ -79,6 +80,7 @@ _cleanup()
{ {
poweron_scratch_dev poweron_scratch_dev
disallow_fail_make_request disallow_fail_make_request
rm -f $tmp.*
} }
trap "_cleanup; exit \$status" 1 2 3 15 trap "_cleanup; exit \$status" 1 2 3 15
@@ -87,7 +89,7 @@ NUM_JOBS=$((4*LOAD_FACTOR))
BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
FILE_SIZE=$((BLK_DEV_SIZE * 512)) FILE_SIZE=$((BLK_DEV_SIZE * 512))
cat >$tmp-$seq.fio <<EOF cat >$fio_config <<EOF
########### ###########
# $seq test's fio activity # $seq test's fio activity
# Filenames derived from jobsname and jobid like follows: # Filenames derived from jobsname and jobid like follows:
@@ -127,7 +129,7 @@ time_based
EOF EOF
_require_fio $tmp-$seq.fio _require_fio $fio_config
# Disable all sync operations to get higher load # Disable all sync operations to get higher load
FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0 -f setattr=1" FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0 -f setattr=1"
@@ -143,8 +145,8 @@ _workout()
$FSSTRESS_PROG $args > /dev/null 2>&1 & $FSSTRESS_PROG $args > /dev/null 2>&1 &
fs_pid=$! fs_pid=$!
echo "Start fio.." echo "Start fio.."
cat $tmp-$seq.fio >> $seqres.full cat $fio_config >> $seqres.full
$FIO_PROG $tmp-$seq.fio >> $seqres.full 2>&1 & $FIO_PROG $fio_config >> $seqres.full 2>&1 &
fio_pid=$! fio_pid=$!
# Let's it work for awhile, and force device failure # Let's it work for awhile, and force device failure