From: Eric Sandeen <sandeen@redhat.com>
To: xfs-oss <xfs@oss.sgi.com>, linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: [PATCH] xfstests: btrfs/276 - stop all fsstress before exiting
Date: Fri, 26 Apr 2013 00:29:21 -0500 [thread overview]
Message-ID: <517A10B1.7040107@redhat.com> (raw)
Tests after 276 were failing because the background fsstress
hadn't quit prior to exit, devices couldn't be unmounted, etc.
Just use the same trick as generic/068 does, and use
a tmpfile to control whether the background loop keeps
running.
Also, no need to umount scratch at cleanup time, the scripts
do that for us.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
(nobody else ran into this? really?)
diff --git a/tests/btrfs/276 b/tests/btrfs/276
index 0a5ce36..9d68b54 100755
--- a/tests/btrfs/276
+++ b/tests/btrfs/276
@@ -36,14 +36,8 @@ noise_pid=0
_cleanup()
{
- if [ $noise_pid -ne 0 ]; then
- echo "background noise kill $noise_pid" >>$seqres.full
- kill $noise_pid
- noise_pid=0
- wait
- fi
- echo "*** unmount"
- umount $SCRATCH_MNT 2>/dev/null
+ rm $tmp.running
+ wait
rm -f $tmp.*
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -210,7 +204,7 @@ workout()
if [ $do_bg_noise -ne 0 ]; then
# make background noise while backrefs are being walked
- while /bin/true; do
+ while [ -f "$tmp.running" ]; do
echo background fsstress >>$seqres.full
run_check $FSSTRESS_PROG -d $SCRATCH_MNT/bgnoise -n 999
echo background rm >>$seqres.full
@@ -263,6 +257,8 @@ nfiles=4
numprocs=1
do_bg_noise=1
+touch $tmp.running
+
workout $filesize $nfiles $numprocs $snap_name $do_bg_noise
echo "*** done"
diff --git a/tests/btrfs/276.out b/tests/btrfs/276.out
index 2032dea..5113164 100644
--- a/tests/btrfs/276.out
+++ b/tests/btrfs/276.out
@@ -1,4 +1,3 @@
QA output created by 276
*** test backref walking
*** done
-*** unmount
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2013-04-26 5:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-26 5:29 Eric Sandeen [this message]
2013-04-26 8:35 ` [PATCH] xfstests: btrfs/276 - stop all fsstress before exiting Jan Schmidt
2013-04-26 13:10 ` Eric Sandeen
2013-05-03 13:06 ` Rich Johnston
2013-05-03 14:41 ` Jan Schmidt
2013-05-03 15:03 ` Rich Johnston
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=517A10B1.7040107@redhat.com \
--to=sandeen@redhat.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox