generic: don't put loop control files on the scratch mount

If we're doing write/overwrite/snapshot/resource exhaustion tests on
the scratch device, use the test directory to hold the loop
termination signal files.  This way we don't run infinitely because
we can't create the flag due to ENOSPC.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/generic/162 b/tests/generic/162
index 5ff2ee2c12dad71bb9d1e477428d80fdcf3f0ef0..61cf4634ccb598deeebcd75d58ecbd0376452760 100755 (executable)
--- a/tests/generic/162
+++ b/tests/generic/162
@@ -33,7 +33,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -51,6 +51,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=512
@@ -64,7 +66,7 @@ _pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
 _scratch_cycle_mount
 
 overwrite() {
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                seq $nr_loops -1 0 | while read i; do
                        _pwrite_byte 0x61 $((i * blksz)) $blksz $testdir/file2 >> $seqres.full
                done
@@ -81,7 +83,7 @@ for i in `seq 1 2`; do
        done
 done
 echo "Finished dedupeing"
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/163 b/tests/generic/163
index fcba677c64c5c67328be57dd87b33af70b0a2495..e2c6042c3b9c8f1f5236e8533541ee93d261dedb 100755 (executable)
--- a/tests/generic/163
+++ b/tests/generic/163
@@ -33,7 +33,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -51,6 +51,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=512
@@ -64,7 +66,7 @@ _pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
 _scratch_cycle_mount
 
 overwrite() {
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                seq $nr_loops -1 0 | while read i; do
                        _pwrite_byte 0x61 $((i * blksz)) $blksz $testdir/file1 >> $seqres.full
                done
@@ -81,7 +83,7 @@ for i in `seq 1 2`; do
        done
 done
 echo "Finished dedupeing"
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/164 b/tests/generic/164
index acacb7f4b17030729a77fe98c1d581179712205a..78ea787e9f3cf3716e35a67aa6186096f33218a9 100755 (executable)
--- a/tests/generic/164
+++ b/tests/generic/164
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -53,6 +53,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=512
@@ -71,7 +73,7 @@ fbytes() {
 }
 
 reader() {
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                _read_range $testdir/file3 0 $((loops * blksz)) | fbytes
        done
 }
@@ -91,7 +93,7 @@ for i in `seq 1 2`; do
        done
 done
 echo "Finished reflinking"
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/165 b/tests/generic/165
index b742d19619e16cb021b2e22ff0b99ec1d33e6723..ca11e1e64b381fd9cbf263d65092a8170c7c246a 100755 (executable)
--- a/tests/generic/165
+++ b/tests/generic/165
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -54,6 +54,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=512
@@ -72,7 +74,7 @@ fbytes() {
 }
 
 reader() {
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                _read_range $testdir/file3 0 $((loops * blksz)) -d | fbytes
        done
 }
@@ -92,7 +94,7 @@ for i in `seq 1 2`; do
        done
 done
 echo "Finished reflinking"
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/166 b/tests/generic/166
index 0e31f2eb9c7994eb0e45cc051ccfea4e13ed4013..8600a133f2d3bc67fce2a62c9f04fea2c80cb483 100755 (executable)
--- a/tests/generic/166
+++ b/tests/generic/166
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -54,6 +54,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=1024
@@ -68,7 +70,7 @@ _scratch_cycle_mount
 # Snapshot creator...
 snappy() {
        n=0
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                out="$(_cp_reflink $testdir/file1 $testdir/snap_$n 2>&1)"
                res=$?
                echo "$out" | grep -q "No space left" && break
@@ -83,7 +85,7 @@ snappy &
 seq $nr_loops -1 0 | while read i; do
        _pwrite_byte 0x63 $((i * blksz)) $blksz -d $testdir/file1 >> $seqres.full
 done
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/167 b/tests/generic/167
index b2d6c87b7fc5eea89ee328b4d57c80c91d31f986..261506bd23530db5e4b280acb78b1dd92d15d0e6 100755 (executable)
--- a/tests/generic/167
+++ b/tests/generic/167
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -53,6 +53,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=1024
@@ -67,7 +69,7 @@ _scratch_cycle_mount
 # Snapshot creator...
 snappy() {
        n=0
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                out="$(_cp_reflink $testdir/file1 $testdir/snap_$n 2>&1)"
                res=$?
                echo "$out" | grep -q "No space left" && break
@@ -82,7 +84,7 @@ snappy &
 seq $nr_loops -1 0 | while read i; do
        _pwrite_byte 0x63 $((i * blksz)) $blksz $testdir/file1 >> $seqres.full
 done
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/168 b/tests/generic/168
index 7047d10a0035102b778b68393ac43cd29ffb321a..ceee2640aa4996418ad67e45b7d8aae12eca9d21 100755 (executable)
--- a/tests/generic/168
+++ b/tests/generic/168
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -52,6 +52,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=1024
@@ -66,7 +68,7 @@ _scratch_cycle_mount
 
 # Direct I/O overwriter...
 overwrite() {
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                seq $nr_loops -1 0 | while read i; do
                        _pwrite_byte 0x63 $((i * blksz)) $blksz $testdir/file2 >> $seqres.full
                done
@@ -82,7 +84,7 @@ seq 1 10 | while read j; do
                [ $? -ne 0 ] && exit
        done
 done
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/170 b/tests/generic/170
index 4861052e48f906a2251d2c333f48a4225263b260..65592430cd4395f1983720bb914a623a0ef53f02 100755 (executable)
--- a/tests/generic/170
+++ b/tests/generic/170
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file
     wait
 }
 
@@ -53,6 +53,8 @@ _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
 mkdir $testdir
 
 loops=1024
@@ -67,7 +69,7 @@ _scratch_cycle_mount
 
 # Direct I/O overwriter...
 overwrite() {
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                seq $nr_loops -1 0 | while read i; do
                        _pwrite_byte 0x63 $((i * blksz)) $blksz -d $testdir/file2 >> $seqres.full
                done
@@ -83,7 +85,7 @@ seq 1 10 | while read j; do
                [ $? -ne 0 ] && exit
        done
 done
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/333 b/tests/generic/333
index 8db86e3c14d80d38e16a4783ff7e9488ee774646..3d874d7e98d2cb97814d787ee0ec553fe92cab66 100755 (executable)
--- a/tests/generic/333
+++ b/tests/generic/333
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file $abort_file
     wait
 }
 
@@ -54,6 +54,10 @@ _scratch_mkfs_sized $((400 * 1048576)) > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
+abort_file=/tmp/abort
+rm -rf $abort_file
 mkdir $testdir
 
 loops=1024
@@ -68,7 +72,7 @@ _scratch_cycle_mount
 # Snapshot creator...
 snappy() {
        n=0
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                out="$(_cp_reflink $testdir/file1 $testdir/snap_$n 2>&1)"
                res=$?
                echo $out | grep -q "No space left" && break
@@ -76,7 +80,7 @@ snappy() {
                test $res -ne 0 && break
                n=$((n + 1))
        done
-       touch $testdir/abort
+       touch $abort_file
 }
 
 echo "Snapshot a file undergoing directio rewrite"
@@ -85,13 +89,13 @@ seq 1 1000 | while read j; do
        seq $nr_loops -1 0 | while read i; do
                out="$(_pwrite_byte 0x63 $((i * blksz)) $blksz -d $testdir/file1 2>&1)"
                echo $out >> $seqres.full
-               echo $out | grep -q "No space left" && touch $testdir/abort
-               echo $out | grep -qi "error" && touch $testdir/abort
-               test -e $testdir/abort && break
+               echo $out | grep -q "No space left" && touch $abort_file
+               echo $out | grep -qi "error" && touch $abort_file
+               test -e $abort_file && break
        done
-       test -e $testdir/abort && break
+       test -e $abort_file && break
 done
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done

diff --git a/tests/generic/334 b/tests/generic/334
index 57141252d9458f64c7fbf6d1f1d1e654c9156a7e..fb21d4f9f178b071c2e8522bd07374b21a576d5a 100755 (executable)
--- a/tests/generic/334
+++ b/tests/generic/334
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 7 15
 _cleanup()
 {
     cd /
-    rm -rf $tmp.*
+    rm -rf $tmp.* $finished_file $abort_file
     wait
 }
 
@@ -53,6 +53,10 @@ _scratch_mkfs_sized $((400 * 1048576)) > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
+finished_file=/tmp/finished
+rm -rf $finished_file
+abort_file=/tmp/abort
+rm -rf $abort_file
 mkdir $testdir
 
 loops=1024
@@ -67,7 +71,7 @@ _scratch_cycle_mount
 # Snapshot creator...
 snappy() {
        n=0
-       while [ ! -e $testdir/finished ]; do
+       while [ ! -e $finished_file ]; do
                out="$(_cp_reflink $testdir/file1 $testdir/snap_$n 2>&1)"
                res=$?
                echo $out | grep -q "No space left" && break
@@ -75,7 +79,7 @@ snappy() {
                test $res -ne 0 && break
                n=$((n + 1))
        done
-       touch $testdir/abort
+       touch $abort_file
 }
 
 echo "Snapshot a file undergoing buffered rewrite"
@@ -84,13 +88,13 @@ seq 1 1000 | while read j; do
        seq $nr_loops -1 0 | while read i; do
                out="$(_pwrite_byte 0x63 $((i * blksz)) $blksz $testdir/file1 2>&1)"
                echo $out >> $seqres.full
-               echo $out | grep -q "No space left" && touch $testdir/abort
-               echo $out | grep -qi "error" && touch $testdir/abort
-               test -e $testdir/abort && break
+               echo $out | grep -q "No space left" && touch $abort_file
+               echo $out | grep -qi "error" && touch $abort_file
+               test -e $abort_file && break
        done
-       test -e $testdir/abort && break
+       test -e $abort_file && break
 done
-touch $testdir/finished
+touch $finished_file
 wait
 
 # success, all done