Return-Path: Received: from mo-p05-ob.rzone.de ([81.169.146.182]:52571 "EHLO mo-p05-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755292Ab3DZIfX (ORCPT ); Fri, 26 Apr 2013 04:35:23 -0400 Message-ID: <517A3C49.9090703@jan-o-sch.net> Date: Fri, 26 Apr 2013 10:35:21 +0200 From: Jan Schmidt MIME-Version: 1.0 To: Eric Sandeen CC: xfs-oss , linux-btrfs Subject: Re: [PATCH] xfstests: btrfs/276 - stop all fsstress before exiting References: <517A10B1.7040107@redhat.com> In-Reply-To: <517A10B1.7040107@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-btrfs-owner@vger.kernel.org List-ID: On Fri, April 26, 2013 at 07:29 (+0200), Eric Sandeen wrote: > Tests after 276 were failing because the background fsstress > hadn't quit prior to exit, devices couldn't be unmounted, etc. I don't see how that would happen. Any further insight? > Just use the same trick as generic/068 does, and use > a tmpfile to control whether the background loop keeps > running. I like that trick :-) Thanks, -Jan > Also, no need to umount scratch at cleanup time, the scripts > do that for us. > > Signed-off-by: Eric Sandeen > --- > > (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 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >