Patchwork xfstests 299-305: remove fio config files after finished test

login
register
mail settings
Submitter Zheng Liu
Date March 19, 2013, 9:30 a.m.
Message ID <1363685450-27452-1-git-send-email-wenqing.lz@taobao.com>
Download mbox | patch
Permalink /patch/228970/
State Not Applicable
Headers show

Comments

Zheng Liu - March 19, 2013, 9:30 a.m.
From: Zheng Liu <wenqing.lz@taobao.com>

After finished test, temporarily fio config file should be removed.

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
---
 299 | 2 +-
 300 | 2 +-
 301 | 2 +-
 302 | 2 +-
 303 | 2 +-
 304 | 2 +-
 305 | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)
Eric Sandeen - March 19, 2013, 4:19 p.m.
On 3/19/13 4:30 AM, Zheng Liu wrote:
> From: Zheng Liu <wenqing.lz@taobao.com>
> 
> After finished test, temporarily fio config file should be removed.

Looks fine, except that in test 300 you don't do rm -f; in every
other test -f is used.  Was that intentional?

Also, while looking at this, in 305 cleanup uses "poweron_scratch_dev"
- is that defined anywhere?  I can't find it.

-Eric

> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
> ---
>  299 | 2 +-
>  300 | 2 +-
>  301 | 2 +-
>  302 | 2 +-
>  303 | 2 +-
>  304 | 2 +-
>  305 | 1 +
>  7 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/299 b/299
> index 4305ead..9d0c32f 100644
> --- a/299
> +++ b/299
> @@ -32,7 +32,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
>  
>  # get standard environment, filters and checks
>  . ./common.rc
> diff --git a/300 b/300
> index 73c9ea7..413f9eb 100644
> --- a/300
> +++ b/300
> @@ -32,7 +32,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp.*; rm $tmp-$seq.fio; exit \$status" 0 1 2 3 15
>  
>  # get standard environment, filters and checks
>  . ./common.rc
> diff --git a/301 b/301
> index fe2e59f..6ac8ecf 100644
> --- a/301
> +++ b/301
> @@ -30,7 +30,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
>  
>  # get standard environment, filters and checks
>  . ./common.rc
> diff --git a/302 b/302
> index e3dceb8..62398c9 100644
> --- a/302
> +++ b/302
> @@ -31,7 +31,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
>  
>  # get standard environment, filters and checks
>  . ./common.rc
> diff --git a/303 b/303
> index 4141442..d198ebb 100644
> --- a/303
> +++ b/303
> @@ -31,7 +31,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
>  
>  # get standard environment, filters and checks
>  . ./common.rc
> diff --git a/304 b/304
> index 5c414bd..fb94fe6 100644
> --- a/304
> +++ b/304
> @@ -32,7 +32,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
>  
>  # get standard environment, filters and checks
>  . ./common.rc
> diff --git a/305 b/305
> index 6393461..9d89321 100644
> --- a/305
> +++ b/305
> @@ -80,6 +80,7 @@ _cleanup()
>  {
>      poweron_scratch_dev
>      disallow_fail_make_request
> +    rm -f $tmp-$seq.fio
>  }
>  trap "_cleanup; exit \$status" 1 2 3 15
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zheng Liu - March 20, 2013, 5:37 a.m.
On Tue, Mar 19, 2013 at 11:19:48AM -0500, Eric Sandeen wrote:
> On 3/19/13 4:30 AM, Zheng Liu wrote:
> > From: Zheng Liu <wenqing.lz@taobao.com>
> > 
> > After finished test, temporarily fio config file should be removed.
> 
> Looks fine, except that in test 300 you don't do rm -f; in every
> other test -f is used.  Was that intentional?

Thanks for pointing it out.  It's a typo.  I will submit a newer patch
to fix it.

> 
> Also, while looking at this, in 305 cleanup uses "poweron_scratch_dev"
> - is that defined anywhere?  I can't find it.

Yeah, I also cannot find it.  I am not sure why it is called here.  I
will take a look at it and make sure that we can remove it.

Regards,
                                                - Zheng
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dave Chinner - March 21, 2013, 1:09 a.m.
On Tue, Mar 19, 2013 at 05:30:50PM +0800, Zheng Liu wrote:
> From: Zheng Liu <wenqing.lz@taobao.com>
> 
> After finished test, temporarily fio config file should be removed.
> 
> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
> ---
>  299 | 2 +-
>  300 | 2 +-
>  301 | 2 +-
>  302 | 2 +-
>  303 | 2 +-
>  304 | 2 +-
>  305 | 1 +
>  7 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/299 b/299
> index 4305ead..9d0c32f 100644
> --- a/299
> +++ b/299
> @@ -32,7 +32,7 @@ echo "QA output created by $seq"
>  here=`pwd`
>  tmp=/tmp/$$
>  status=1	# failure is the default!
> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15

Umm, wouldn't this be better:

-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp*; exit \$status" 0 1 2 3 15


Cheers,

Dave.
Eric Sandeen - March 21, 2013, 2:07 a.m.
On 3/20/13 8:09 PM, Dave Chinner wrote:
> On Tue, Mar 19, 2013 at 05:30:50PM +0800, Zheng Liu wrote:
>> From: Zheng Liu <wenqing.lz@taobao.com>
>>
>> After finished test, temporarily fio config file should be removed.
>>
>> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
>> ---
>>  299 | 2 +-
>>  300 | 2 +-
>>  301 | 2 +-
>>  302 | 2 +-
>>  303 | 2 +-
>>  304 | 2 +-
>>  305 | 1 +
>>  7 files changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/299 b/299
>> index 4305ead..9d0c32f 100644
>> --- a/299
>> +++ b/299
>> @@ -32,7 +32,7 @@ echo "QA output created by $seq"
>>  here=`pwd`
>>  tmp=/tmp/$$
>>  status=1	# failure is the default!
>> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
> 
> Umm, wouldn't this be better:
> 
> -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> +trap "rm -f $tmp*; exit \$status" 0 1 2 3 15
> 

Naming the files $tmp.fio would have worked too, but *shrug*
doesn't seem that critical.  Still:

>      2. You can safely create temporary files that are not part of the
>         filesystem tests (e.g. to catch output, prepare lists of things
>         to do, etc.) in files named $tmp.<anything>.  The standard test
>         script framework created by "new" will initialize $tmp and
>         cleanup on exit.

-Eric

> Cheers,
> 
> Dave.
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dave Chinner - March 21, 2013, 2:47 a.m.
On Wed, Mar 20, 2013 at 09:07:27PM -0500, Eric Sandeen wrote:
> On 3/20/13 8:09 PM, Dave Chinner wrote:
> > On Tue, Mar 19, 2013 at 05:30:50PM +0800, Zheng Liu wrote:
> >> From: Zheng Liu <wenqing.lz@taobao.com>
> >>
> >> After finished test, temporarily fio config file should be removed.
> >>
> >> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
> >> ---
> >>  299 | 2 +-
> >>  300 | 2 +-
> >>  301 | 2 +-
> >>  302 | 2 +-
> >>  303 | 2 +-
> >>  304 | 2 +-
> >>  305 | 1 +
> >>  7 files changed, 7 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/299 b/299
> >> index 4305ead..9d0c32f 100644
> >> --- a/299
> >> +++ b/299
> >> @@ -32,7 +32,7 @@ echo "QA output created by $seq"
> >>  here=`pwd`
> >>  tmp=/tmp/$$
> >>  status=1	# failure is the default!
> >> +trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
> > 
> > Umm, wouldn't this be better:
> > 
> > -trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> > +trap "rm -f $tmp*; exit \$status" 0 1 2 3 15
> > 
> 
> Naming the files $tmp.fio would have worked too, but *shrug*
> doesn't seem that critical.  Still:
> 
> >      2. You can safely create temporary files that are not part of the
> >         filesystem tests (e.g. to catch output, prepare lists of things
> >         to do, etc.) in files named $tmp.<anything>.  The standard test
> >         script framework created by "new" will initialize $tmp and
> >         cleanup on exit.

Good point. With that in mind, I think renaming the fio files is the
right thing to do, not changing the traps to have to handle
arbitrary tmp file names...

Cheers,

Dave.

Patch

diff --git a/299 b/299
index 4305ead..9d0c32f 100644
--- a/299
+++ b/299
@@ -32,7 +32,7 @@  echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
diff --git a/300 b/300
index 73c9ea7..413f9eb 100644
--- a/300
+++ b/300
@@ -32,7 +32,7 @@  echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; rm $tmp-$seq.fio; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
diff --git a/301 b/301
index fe2e59f..6ac8ecf 100644
--- a/301
+++ b/301
@@ -30,7 +30,7 @@  echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
diff --git a/302 b/302
index e3dceb8..62398c9 100644
--- a/302
+++ b/302
@@ -31,7 +31,7 @@  echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
diff --git a/303 b/303
index 4141442..d198ebb 100644
--- a/303
+++ b/303
@@ -31,7 +31,7 @@  echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
diff --git a/304 b/304
index 5c414bd..fb94fe6 100644
--- a/304
+++ b/304
@@ -32,7 +32,7 @@  echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; rm -f $tmp-$seq.fio; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
diff --git a/305 b/305
index 6393461..9d89321 100644
--- a/305
+++ b/305
@@ -80,6 +80,7 @@  _cleanup()
 {
     poweron_scratch_dev
     disallow_fail_make_request
+    rm -f $tmp-$seq.fio
 }
 trap "_cleanup; exit \$status" 1 2 3 15