]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
xfs/013: don't fail because cp ran out of space
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 1 Nov 2017 21:47:48 +0000 (14:47 -0700)
committerEryu Guan <eguan@redhat.com>
Fri, 3 Nov 2017 11:04:49 +0000 (19:04 +0800)
Don't fail xfs/013 just because cp -Rl runs out of space to allocate
inodes and sprays the ENOSPC messages into the golden output.  We
want to stress the finobt by using cp to push us near ENOSPC
conditions, so it's fine to let cp run out of space.

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>
tests/xfs/013

index 4e49e4bd62c89848f620c1b45dc8ad5180304d6f..80298caba87e2d8ae683aefe30d38675b7a48d06 100755 (executable)
@@ -48,6 +48,10 @@ _cleanup()
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
+filter_enospc() {
+       sed -e '/^.*No space left on device.*/d'
+}
+
 _create()
 {
        dir=$1
@@ -56,7 +60,7 @@ _create()
        mkdir -p $dir
        for i in $(seq 0 $count)
        do
-               touch $dir/$i
+               touch $dir/$i 2>&1 | filter_enospc
        done
 }
 
@@ -70,7 +74,7 @@ _rand_replace()
        do
                file=$((RANDOM % count))
                rm -f $dir/$file
-               touch $dir/$file
+               touch $dir/$file 2>&1 | filter_enospc
        done
 }
 
@@ -141,7 +145,8 @@ $FSSTRESS_PROG -d $SCRATCH_MNT/fsstress -n 9999999 -p 2 -S t \
 for i in $(seq 1 $LOOPS)
 do
        # hard link the content of the current directory to the next
-       cp -Rl $SCRATCH_MNT/dir$i $SCRATCH_MNT/dir$((i+1))
+       cp -Rl $SCRATCH_MNT/dir$i $SCRATCH_MNT/dir$((i+1)) 2>&1 | \
+               filter_enospc
 
        # do a random replacement of files in the new directory
        _rand_replace $SCRATCH_MNT/dir$((i+1)) $COUNT