On Mon, Apr 18, 2022 at 10:07:37AM -0700, Darrick J. Wong wrote:
> On Sat, Apr 16, 2022 at 08:13:59PM +0300, Amir Goldstein wrote:
> > On Sat, Apr 16, 2022 at 5:11 PM Zorro Lang <zlang@xxxxxxxxxx> wrote:
> > >
> > > On Sat, Apr 16, 2022 at 12:20:22PM +0300, Amir Goldstein wrote:
> > > > On Fri, Apr 15, 2022 at 12:56 PM Zorro Lang <zlang@xxxxxxxxxx> wrote:
> > > > >
> > > > > On Fri, Apr 15, 2022 at 12:25:44AM +0800, Zorro Lang wrote:
> > > > > > On Wed, Apr 13, 2022 at 10:26:56AM +1000, Dave Chinner wrote:
> > > > > > > On Tue, Apr 12, 2022 at 10:25:00PM +0800, Zorro Lang wrote:
> > > > > > > > On Tue, Apr 12, 2022 at 02:59:42PM +0200, David Disseldorp wrote:
> > > > > > > > > On Mon, 11 Apr 2022 15:48:33 +1000, Dave Chinner wrote:
> > > > > > > > >
> > > > > > > > > > From: Dave Chinner <dchinner@xxxxxxxxxx>
> > > > > > > > > >
> > > > > > > > > > If you ctrl-c generic/019, it leaves fsstress processes running.
> > > > > > > > > > Kill them in the cleanup function so that they don't have to be
> > > > > > > > > > manually killed after interrupting the test.
> > > > > > > > > >
> > > > > > > > > > While touching the _cleanup() function, make it do everything that
> > > > > > > > > > the generic _cleanup function it overrides does and fix the
> > > > > > > > > > indenting.
> > > > > > > > > >
> > > > > > > > > > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> > > > > > > > > > ---
> > > > > > > > > > tests/generic/019 | 6 ++++--
> > > > > > > > > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > > > > > > > > >
> > > > > > > > > > diff --git a/tests/generic/019 b/tests/generic/019
> > > > > > > > > > index db56dac1..cda107f4 100755
> > > > > > > > > > --- a/tests/generic/019
> > > > > > > > > > +++ b/tests/generic/019
> > > > > > > > > > @@ -53,8 +53,10 @@ stop_fail_scratch_dev()
> > > > > > > > > > # Override the default cleanup function.
> > > > > > > > > > _cleanup()
> > > > > > > > > > {
> > > > > > > > > > - disallow_fail_make_request
> > > > > > > > > > - rm -f $tmp.*
> > > > > > > > > > + kill $fs_pid $fio_pid &> /dev/null
> > > > > > > > > > + disallow_fail_make_request
> > > > > > > > > > + cd /
> > > > > > > > > > + rm -r -f $tmp.*
> > > > > > > > > > }
> > > > > > > > > >
> > > > > > > > > > RUN_TIME=$((20+10*$TIME_FACTOR))
> > > > > > > > >
> > > > > > > > > Might be worth unset'ing the "fs_pid" and "fio_pid" variables after the
> > > > > > > > > wait, but should be fine as-is:
> > > > > > > >
> > > > > > > > I agree. Better to avoid killing other system processes. Or how about this place
> > > > > > > > does (avoid killing system useful processes):
> > > > > > > > $KILLALL_PROG -q $FSSTRESS_PROG
> > > > > > > > $KILLALL_PROG -q $FIO_PROG
> > > > > > > >
> > > > > > > > Another picky question is, do we need to use a while loop checking, until the
> > > > > > > > processes really get killed? :)
> > > > > > >
> > > > > > > Do we really need to paint the bikeshed over how best to kill a
> > > > > > > process? I don't have time to do that, this is just a drive-by fix
> > > > > > > that works for me....
> > > > > >
> > > > > > Sure Dave:) The while loop checking is a little picky, I just ask what do you think, no
> > > > > > objection if you don't like that. Due to quick cleanup and exit is a good reason too.
> > > > > >
> > > > > > I think it might be worth doing "$KILLALL_PROG -q $FSSTRESS_PROG $FIO_PROG" at least, to
> > > > > > avoid killing other processes might be useful.
> > > >
> > > > That has much more likelihood to kill processes not spawn by the test
> > > > then pid wraparound.
> > >
> > > Yes, you're right. But generally we don't run xfstests with other testing, to avoid other
> > > testing break dmesg checking of xfstests. (Is there a way to help different process get
> > > independent dmesg out? If there's, I'm very glad to know how to do that, then I can run
> > > xfstests concurrently in one system:)
> > >
> > > Anyway, we can choose another way -- "unset'ing the "fs_pid" and "fio_pid" variables
> > > after the wait", both are fine to me.
> > >
> >
> > Fine by me
>
> The change to clear the fs_pid/fio_pid variables was not correct and now
> causes generic/019 to fail. I'll send a patch shortly.
Yeah, it shouldn't be:
unset $fs_pid
unset $fio_pid
The "$" should be removed.
>
> --D
>
> > Thanks,
> > Amir.
>
