btrfs: fix test btrfs/007 to not leave temporary files in /tmp
PATCH 1/1 btrfs: fix test btrfs/007 to not leave temporary files in /tmp
From: Filipe Manana <[email protected]>
This test was using the "mktemp -d" command to create a temporary directory for storing send streams and computations from fssum, without ever deleting them when it finishes. Therefore after running it for many times it filled up all space from /tmp.
Fix this by using a temporary directory in TEST_DEV instead, as all the more recent send/receive tests do, to store these files, and making sure they get deleted when the test finishes. On average the sum of the size of those files is between 5.5Mb to 6Mb, but changing the number of operations for fsstress makes it even bigger.
Signed-off-by Filipe Manana <[email protected]>
--- tests/btrfs/007 | 33 +++++++++++++++++++-------------- tests/btrfs/007.out | 1 - 2 files changed, 19 insertions(+), 15 deletions(-)
tests/btrfs/007 +19 -14
@@ -16,14 +16,14 @@ seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq" -tmp=`mktemp -d` +tmp=/tmp/$$ status=1 _cleanup() { - echo "*** unmount" - _scratch_unmount 2>/dev/null + cd / rm -f $tmp.* + rm -fr $send_files_dir } trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -38,7 +38,11 @@ _require_scratch _require_fssum _require_seek_data_hole +send_files_dir=$TEST_DIR/btrfs-test-$seq + rm -f $seqres.full +rm -fr $send_files_dir +mkdir $send_files_dir workout() {
@@ -57,19 +61,20 @@ workout() _run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/incr - echo "# $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > $tmp/base.snap" \ + echo "# $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > ${send_files_dir}/base.snap" \ >> $seqres.full - $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > $tmp/base.snap 2>> $seqres.full \ + $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > $send_files_dir/base.snap 2>> $seqres.full \ || _fail "failed: '$@'" echo "# $BTRFS_UTIL_PROG send -p $SCRATCH_MNT/base\ - $SCRATCH_MNT/incr > $tmp/incr.snap" >> $seqres.full + $SCRATCH_MNT/incr > ${send_files_dir}/incr.snap" >> $seqres.full $BTRFS_UTIL_PROG send -p $SCRATCH_MNT/base \ - $SCRATCH_MNT/incr > $tmp/incr.snap 2>> $seqres.full \ + $SCRATCH_MNT/incr > $send_files_dir/incr.snap 2>> $seqres.full \ || _fail "failed: '$@'" - run_check $FSSUM_PROG -A -f -w $tmp/base.fssum $SCRATCH_MNT/base - run_check $FSSUM_PROG -A -f -w $tmp/incr.fssum -x $SCRATCH_MNT/incr/base \ - $SCRATCH_MNT/incr + run_check $FSSUM_PROG -A -f -w $send_files_dir/base.fssum \ + $SCRATCH_MNT/base + run_check $FSSUM_PROG -A -f -w $send_files_dir/incr.fssum \ + -x $SCRATCH_MNT/incr/base $SCRATCH_MNT/incr _scratch_unmount >/dev/null 2>&1 echo "*** mkfs -dsize=$fsz" >>$seqres.full
@@ -78,11 +83,11 @@ workout() || _fail "size=$fsz mkfs failed" _scratch_mount "-o noatime" - _run_btrfs_util_prog receive $SCRATCH_MNT < $tmp/base.snap - run_check $FSSUM_PROG -r $tmp/base.fssum $SCRATCH_MNT/base + _run_btrfs_util_prog receive $SCRATCH_MNT < $send_files_dir/base.snap + run_check $FSSUM_PROG -r $send_files_dir/base.fssum $SCRATCH_MNT/base - _run_btrfs_util_prog receive $SCRATCH_MNT < $tmp/incr.snap - run_check $FSSUM_PROG -r $tmp/incr.fssum $SCRATCH_MNT/incr + _run_btrfs_util_prog receive $SCRATCH_MNT < $send_files_dir/incr.snap + run_check $FSSUM_PROG -r $send_files_dir/incr.fssum $SCRATCH_MNT/incr } echo "*** test send / receive"
tests/btrfs/007.out +0 -1
@@ -1,4 +1,3 @@ QA output created by 007 *** test send / receive *** done -*** unmount
Signature · 1 line
2.11.0