[PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Yang Xu]

When I test this case under GPT disklabel type, this case will fail,
as below:
cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
length of Log Record: 258048    prev offset: -1         num ops: 1

...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
extended-header: cycle: 1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...

my mkfs information as below:
meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
         =                       sectsz=512   attr=2, projid32bit=1
         =                       crc=1        finobt=1, sparse=1, rmapbt=0
         =                       reflink=1
data     =                       bsize=4096   blocks=5242880, imaxpct=25
         =                       sunit=64     swidth=64 blks
naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
log      =internal log           bsize=4096   blocks=5184, version=2
         =                       sectsz=512   sunit=64 blks, lazy-count=1
realtime =none                   extsz=4096   blocks=0, rtextents=0

It reports this info because xfs_logprint only read 32k header every time, so it
needs to read more times. We can filter this useless info.

Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
 tests/xfs/029 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/xfs/029 b/tests/xfs/029
index f532a21b..99742792 100755
--- a/tests/xfs/029
+++ b/tests/xfs/029
@@ -45,7 +45,7 @@ echo
 _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
 
 echo
-_scratch_xfs_logprint | _filter_logprint
+_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"
 
 status=0
 exit
-- 
2.18.0

Re: [PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Darrick J. Wong]

On Mon, Feb 17, 2020 at 03:02:20PM +0800, Yang Xu wrote:
> When I test this case under GPT disklabel type, this case will fail,
> as below:
> cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
> length of Log Record: 258048    prev offset: -1         num ops: 1
> 
> ...
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> extended-header: cycle: 1
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ...
> 
> my mkfs information as below:
> meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
>          =                       sectsz=512   attr=2, projid32bit=1
>          =                       crc=1        finobt=1, sparse=1, rmapbt=0
>          =                       reflink=1
> data     =                       bsize=4096   blocks=5242880, imaxpct=25
>          =                       sunit=64     swidth=64 blks
> naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
> log      =internal log           bsize=4096   blocks=5184, version=2
>          =                       sectsz=512   sunit=64 blks, lazy-count=1
> realtime =none                   extsz=4096   blocks=0, rtextents=0
> 
> It reports this info because xfs_logprint only read 32k header every time, so it
> needs to read more times. We can filter this useless info.
> 
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> ---
>  tests/xfs/029 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/xfs/029 b/tests/xfs/029
> index f532a21b..99742792 100755
> --- a/tests/xfs/029
> +++ b/tests/xfs/029
> @@ -45,7 +45,7 @@ echo
>  _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
>  
>  echo
> -_scratch_xfs_logprint | _filter_logprint
> +_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"

Is there a reason not to add that to _filter_logprint?

--D

>  
>  status=0
>  exit
> -- 
> 2.18.0
> 
> 
> 

Re: [PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Yang Xu]

on 2020/02/19 8:32, Darrick J. Wong wrote:
> On Mon, Feb 17, 2020 at 03:02:20PM +0800, Yang Xu wrote:
>> When I test this case under GPT disklabel type, this case will fail,
>> as below:
>> cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
>> length of Log Record: 258048    prev offset: -1         num ops: 1
>>
>> ...
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> extended-header: cycle: 1
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ...
>>
>> my mkfs information as below:
>> meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
>>           =                       sectsz=512   attr=2, projid32bit=1
>>           =                       crc=1        finobt=1, sparse=1, rmapbt=0
>>           =                       reflink=1
>> data     =                       bsize=4096   blocks=5242880, imaxpct=25
>>           =                       sunit=64     swidth=64 blks
>> naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
>> log      =internal log           bsize=4096   blocks=5184, version=2
>>           =                       sectsz=512   sunit=64 blks, lazy-count=1
>> realtime =none                   extsz=4096   blocks=0, rtextents=0
>>
>> It reports this info because xfs_logprint only read 32k header every time, so it
>> needs to read more times. We can filter this useless info.
>>
>> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
>> ---
>>   tests/xfs/029 | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/xfs/029 b/tests/xfs/029
>> index f532a21b..99742792 100755
>> --- a/tests/xfs/029
>> +++ b/tests/xfs/029
>> @@ -45,7 +45,7 @@ echo
>>   _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
>>   
>>   echo
>> -_scratch_xfs_logprint | _filter_logprint
>> +_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"
> 
> Is there a reason not to add that to _filter_logprint?
I haven't mastered perl(never used). Can you add that to filter_logprint?

Best Regards
Yang Xu
> 
> --D
> 
>>   
>>   status=0
>>   exit
>> -- 
>> 2.18.0
>>
>>
>>
> 
> 

Re: [PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Darrick J. Wong]

On Wed, Feb 19, 2020 at 09:27:29AM +0800, Yang Xu wrote:
> 
> 
> on 2020/02/19 8:32, Darrick J. Wong wrote:
> > On Mon, Feb 17, 2020 at 03:02:20PM +0800, Yang Xu wrote:
> > > When I test this case under GPT disklabel type, this case will fail,
> > > as below:
> > > cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
> > > length of Log Record: 258048    prev offset: -1         num ops: 1
> > > 
> > > ...
> > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > extended-header: cycle: 1
> > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > ...
> > > 
> > > my mkfs information as below:
> > > meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
> > >           =                       sectsz=512   attr=2, projid32bit=1
> > >           =                       crc=1        finobt=1, sparse=1, rmapbt=0
> > >           =                       reflink=1
> > > data     =                       bsize=4096   blocks=5242880, imaxpct=25
> > >           =                       sunit=64     swidth=64 blks
> > > naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
> > > log      =internal log           bsize=4096   blocks=5184, version=2
> > >           =                       sectsz=512   sunit=64 blks, lazy-count=1
> > > realtime =none                   extsz=4096   blocks=0, rtextents=0
> > > 
> > > It reports this info because xfs_logprint only read 32k header every time, so it
> > > needs to read more times. We can filter this useless info.
> > > 
> > > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> > > ---
> > >   tests/xfs/029 | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/tests/xfs/029 b/tests/xfs/029
> > > index f532a21b..99742792 100755
> > > --- a/tests/xfs/029
> > > +++ b/tests/xfs/029
> > > @@ -45,7 +45,7 @@ echo
> > >   _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
> > >   echo
> > > -_scratch_xfs_logprint | _filter_logprint
> > > +_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"
> > 
> > Is there a reason not to add that to _filter_logprint?
> I haven't mastered perl(never used). Can you add that to filter_logprint?

That helper function does not call perl.

--D

> Best Regards
> Yang Xu
> > 
> > --D
> > 
> > >   status=0
> > >   exit
> > > -- 
> > > 2.18.0
> > > 
> > > 
> > > 
> > 
> > 
> 
> 

Re: [PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Yang Xu]

on 2020/02/19 13:07, Darrick J. Wong wrote:
> On Wed, Feb 19, 2020 at 09:27:29AM +0800, Yang Xu wrote:
>>
>>
>> on 2020/02/19 8:32, Darrick J. Wong wrote:
>>> On Mon, Feb 17, 2020 at 03:02:20PM +0800, Yang Xu wrote:
>>>> When I test this case under GPT disklabel type, this case will fail,
>>>> as below:
>>>> cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
>>>> length of Log Record: 258048    prev offset: -1         num ops: 1
>>>>
>>>> ...
>>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>> extended-header: cycle: 1
>>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>> ...
>>>>
>>>> my mkfs information as below:
>>>> meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
>>>>            =                       sectsz=512   attr=2, projid32bit=1
>>>>            =                       crc=1        finobt=1, sparse=1, rmapbt=0
>>>>            =                       reflink=1
>>>> data     =                       bsize=4096   blocks=5242880, imaxpct=25
>>>>            =                       sunit=64     swidth=64 blks
>>>> naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
>>>> log      =internal log           bsize=4096   blocks=5184, version=2
>>>>            =                       sectsz=512   sunit=64 blks, lazy-count=1
>>>> realtime =none                   extsz=4096   blocks=0, rtextents=0
>>>>
>>>> It reports this info because xfs_logprint only read 32k header every time, so it
>>>> needs to read more times. We can filter this useless info.
>>>>
>>>> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
>>>> ---
>>>>    tests/xfs/029 | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/tests/xfs/029 b/tests/xfs/029
>>>> index f532a21b..99742792 100755
>>>> --- a/tests/xfs/029
>>>> +++ b/tests/xfs/029
>>>> @@ -45,7 +45,7 @@ echo
>>>>    _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
>>>>    echo
>>>> -_scratch_xfs_logprint | _filter_logprint
>>>> +_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"
>>>
>>> Is there a reason not to add that to _filter_logprint?
>> I haven't mastered perl(never used). Can you add that to filter_logprint?
> 
> That helper function does not call perl.
Hi Darrick
xfs/029 used itself filter_logprint(perl) not used common/log 
filter_logprint(sed) function. Do we should use common/log and change 
xfs/029.out? Also, common/log filter_logprint has considered "~~~" and 
"extended-header: cycle: 1" output.

Best Regards
Yang Xu
> 
> --D
> 
>> Best Regards
>> Yang Xu
>>>
>>> --D
>>>
>>>>    status=0
>>>>    exit
>>>> -- 
>>>> 2.18.0
>>>>
>>>>
>>>>
>>>
>>>
>>
>>
> 
> 

Re: [PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Darrick J. Wong]

On Wed, Feb 19, 2020 at 05:49:30PM +0800, Yang Xu wrote:
> 
> on 2020/02/19 13:07, Darrick J. Wong wrote:
> > On Wed, Feb 19, 2020 at 09:27:29AM +0800, Yang Xu wrote:
> > > 
> > > 
> > > on 2020/02/19 8:32, Darrick J. Wong wrote:
> > > > On Mon, Feb 17, 2020 at 03:02:20PM +0800, Yang Xu wrote:
> > > > > When I test this case under GPT disklabel type, this case will fail,
> > > > > as below:
> > > > > cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
> > > > > length of Log Record: 258048    prev offset: -1         num ops: 1
> > > > > 
> > > > > ...
> > > > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > > > extended-header: cycle: 1
> > > > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > > > ...
> > > > > 
> > > > > my mkfs information as below:
> > > > > meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
> > > > >            =                       sectsz=512   attr=2, projid32bit=1
> > > > >            =                       crc=1        finobt=1, sparse=1, rmapbt=0
> > > > >            =                       reflink=1
> > > > > data     =                       bsize=4096   blocks=5242880, imaxpct=25
> > > > >            =                       sunit=64     swidth=64 blks
> > > > > naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
> > > > > log      =internal log           bsize=4096   blocks=5184, version=2
> > > > >            =                       sectsz=512   sunit=64 blks, lazy-count=1
> > > > > realtime =none                   extsz=4096   blocks=0, rtextents=0
> > > > > 
> > > > > It reports this info because xfs_logprint only read 32k header every time, so it
> > > > > needs to read more times. We can filter this useless info.
> > > > > 
> > > > > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> > > > > ---
> > > > >    tests/xfs/029 | 2 +-
> > > > >    1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/tests/xfs/029 b/tests/xfs/029
> > > > > index f532a21b..99742792 100755
> > > > > --- a/tests/xfs/029
> > > > > +++ b/tests/xfs/029
> > > > > @@ -45,7 +45,7 @@ echo
> > > > >    _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
> > > > >    echo
> > > > > -_scratch_xfs_logprint | _filter_logprint
> > > > > +_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"
> > > > 
> > > > Is there a reason not to add that to _filter_logprint?
> > > I haven't mastered perl(never used). Can you add that to filter_logprint?
> > 
> > That helper function does not call perl.
> Hi Darrick
> xfs/029 used itself filter_logprint(perl) not used common/log
> filter_logprint(sed) function.

<grumble> Ok, that function in xfs/029 shouldn't be prefixed with "_".

> Do we should use common/log and change
> xfs/029.out? Also, common/log filter_logprint has considered "~~~" and
> "extended-header: cycle: 1" output.

<shrug> I'm not much of a perl hacker either.

--D

> Best Regards
> Yang Xu
> > 
> > --D
> > 
> > > Best Regards
> > > Yang Xu
> > > > 
> > > > --D
> > > > 
> > > > >    status=0
> > > > >    exit
> > > > > -- 
> > > > > 2.18.0
> > > > > 
> > > > > 
> > > > > 
> > > > 
> > > > 
> > > 
> > > 
> > 
> > 
> 
> 

Re: [PATCH] xfs/029: filter out "extended-header: cycle: 1" from output

[Yang Xu]

on 2020/02/20 6:09, Darrick J. Wong wrote:
> On Wed, Feb 19, 2020 at 05:49:30PM +0800, Yang Xu wrote:
>>
>> on 2020/02/19 13:07, Darrick J. Wong wrote:
>>> On Wed, Feb 19, 2020 at 09:27:29AM +0800, Yang Xu wrote:
>>>>
>>>>
>>>> on 2020/02/19 8:32, Darrick J. Wong wrote:
>>>>> On Mon, Feb 17, 2020 at 03:02:20PM +0800, Yang Xu wrote:
>>>>>> When I test this case under GPT disklabel type, this case will fail,
>>>>>> as below:
>>>>>> cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
>>>>>> length of Log Record: 258048    prev offset: -1         num ops: 1
>>>>>>
>>>>>> ...
>>>>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>> extended-header: cycle: 1
>>>>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>> ...
>>>>>>
>>>>>> my mkfs information as below:
>>>>>> meta-data=/dev/sda7              isize=512    agcount=16, agsize=327680 blks
>>>>>>             =                       sectsz=512   attr=2, projid32bit=1
>>>>>>             =                       crc=1        finobt=1, sparse=1, rmapbt=0
>>>>>>             =                       reflink=1
>>>>>> data     =                       bsize=4096   blocks=5242880, imaxpct=25
>>>>>>             =                       sunit=64     swidth=64 blks
>>>>>> naming   =version 2              bsize=4096   ascii-ci=0, ftype=1
>>>>>> log      =internal log           bsize=4096   blocks=5184, version=2
>>>>>>             =                       sectsz=512   sunit=64 blks, lazy-count=1
>>>>>> realtime =none                   extsz=4096   blocks=0, rtextents=0
>>>>>>
>>>>>> It reports this info because xfs_logprint only read 32k header every time, so it
>>>>>> needs to read more times. We can filter this useless info.
>>>>>>
>>>>>> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
>>>>>> ---
>>>>>>     tests/xfs/029 | 2 +-
>>>>>>     1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/tests/xfs/029 b/tests/xfs/029
>>>>>> index f532a21b..99742792 100755
>>>>>> --- a/tests/xfs/029
>>>>>> +++ b/tests/xfs/029
>>>>>> @@ -45,7 +45,7 @@ echo
>>>>>>     _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
>>>>>>     echo
>>>>>> -_scratch_xfs_logprint | _filter_logprint
>>>>>> +_scratch_xfs_logprint | _filter_logprint | sed -e "/^~~~/d" -e "/extended-header/d"
>>>>>
>>>>> Is there a reason not to add that to _filter_logprint?
>>>> I haven't mastered perl(never used). Can you add that to filter_logprint?
>>>
>>> That helper function does not call perl.
>> Hi Darrick
>> xfs/029 used itself filter_logprint(perl) not used common/log
>> filter_logprint(sed) function.
> 
> <grumble> Ok, that function in xfs/029 shouldn't be prefixed with "_".
also for xfs/044. I will fix that.
> 
>> Do we should use common/log and change
>> xfs/029.out? Also, common/log filter_logprint has considered "~~~" and
>> "extended-header: cycle: 1" output.
> 
> <shrug> I'm not much of a perl hacker either.
OK. I will think about this. Thanks

Best Regards
Yang Xu
> 
> --D
> 
>> Best Regards
>> Yang Xu
>>>
>>> --D
>>>
>>>> Best Regards
>>>> Yang Xu
>>>>>
>>>>> --D
>>>>>
>>>>>>     status=0
>>>>>>     exit
>>>>>> -- 
>>>>>> 2.18.0
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>
>>>
>>
>>
> 
> 

[PATCH v2 1/2] xfs/029: filter out "extended-header: cycle: 1" from output

[Yang Xu]

When I test this case(default lsunit 256k), this case will fail,
as below:
cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
length of Log Record: 258048    prev offset: -1         num ops: 1

...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
extended-header: cycle: 1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...

It reports this info because xfs_logprint only read 32k header every time, so it
needs to read more times. We can filter this useless info.

common/log also has _filter_logprint function. only library function is
prefixed with "_", remove '_'.

Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
 tests/xfs/029 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/xfs/029 b/tests/xfs/029
index f532a21b..dbe700ab 100755
--- a/tests/xfs/029
+++ b/tests/xfs/029
@@ -19,7 +19,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/filter
 
-_filter_logprint()
+filter_logprint()
 {
 	perl -ne '
 	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
@@ -31,6 +31,8 @@ _filter_logprint()
             s/(length of Log Record:) \d+/$1 <LEN>/;
             s/version: \d/version: <VERN>/;
 	    s/h_size: \d+/h_size: <H_SIZE>/;
+	    s/^~+[\r|\n]+$//;
+	    s/extended-header: cycle: 1[\r|\n]+$//;
 	    print;
 	'
 }
@@ -45,7 +47,7 @@ echo
 _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
 
 echo
-_scratch_xfs_logprint | _filter_logprint
+_scratch_xfs_logprint | filter_logprint
 
 status=0
 exit
-- 
2.18.0

[PATCH v2 2/2] xfs/044: Remove useless _filter_logprint

[Yang Xu]

xfs/044 has customized  _filter_logprint function, but it was never
used. So remove it.

Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
 tests/xfs/044 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/xfs/044 b/tests/xfs/044
index 4a476985..0c6a421d 100755
--- a/tests/xfs/044
+++ b/tests/xfs/044
@@ -25,18 +25,6 @@ _supported_os Linux
 
 _require_logdev
 
-_filter_logprint()
-{
-	perl -ne '
-	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
-	    s/log device: ([\w|\/.-]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
-	    s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
-	    s/uuid: ([abcdef\d-]+)\s+format: (.+)/uuid: UUID format: FORMAT/;
-	    s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
-	    print;
-	'
-}
-
 _check_mount()
 {
     echo "    *** mount (expect success)"
-- 
2.18.0

Re: [PATCH v2 2/2] xfs/044: Remove useless _filter_logprint

[Darrick J. Wong]

On Thu, Feb 20, 2020 at 03:58:48PM +0800, Yang Xu wrote:
> xfs/044 has customized  _filter_logprint function, but it was never
> used. So remove it.
> 
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  tests/xfs/044 | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/tests/xfs/044 b/tests/xfs/044
> index 4a476985..0c6a421d 100755
> --- a/tests/xfs/044
> +++ b/tests/xfs/044
> @@ -25,18 +25,6 @@ _supported_os Linux
>  
>  _require_logdev
>  
> -_filter_logprint()
> -{
> -	perl -ne '
> -	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
> -	    s/log device: ([\w|\/.-]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
> -	    s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
> -	    s/uuid: ([abcdef\d-]+)\s+format: (.+)/uuid: UUID format: FORMAT/;
> -	    s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
> -	    print;
> -	'
> -}
> -
>  _check_mount()
>  {
>      echo "    *** mount (expect success)"
> -- 
> 2.18.0
> 
> 
> 

Re: [PATCH v2 1/2] xfs/029: filter out "extended-header: cycle: 1" from output

[Darrick J. Wong]

On Thu, Feb 20, 2020 at 03:58:47PM +0800, Yang Xu wrote:
> When I test this case(default lsunit 256k), this case will fail,
> as below:
> cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
> length of Log Record: 258048    prev offset: -1         num ops: 1
> 
> ...
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> extended-header: cycle: 1
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ...
> 
> It reports this info because xfs_logprint only read 32k header every time, so it
> needs to read more times. We can filter this useless info.
> 
> common/log also has _filter_logprint function. only library function is
> prefixed with "_", remove '_'.
> 
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> ---
>  tests/xfs/029 | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/xfs/029 b/tests/xfs/029
> index f532a21b..dbe700ab 100755
> --- a/tests/xfs/029
> +++ b/tests/xfs/029
> @@ -19,7 +19,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
>  . ./common/rc
>  . ./common/filter
>  
> -_filter_logprint()
> +filter_logprint()
>  {
>  	perl -ne '
>  	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
> @@ -31,6 +31,8 @@ _filter_logprint()
>              s/(length of Log Record:) \d+/$1 <LEN>/;
>              s/version: \d/version: <VERN>/;
>  	    s/h_size: \d+/h_size: <H_SIZE>/;
> +	    s/^~+[\r|\n]+$//;
> +	    s/extended-header: cycle: 1[\r|\n]+$//;

I guess this works, but do you want to delete this line for line with
"extended-header: cycle: <some number>"?

>  	    print;
>  	'
>  }
> @@ -45,7 +47,7 @@ echo
>  _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
>  
>  echo
> -_scratch_xfs_logprint | _filter_logprint
> +_scratch_xfs_logprint | filter_logprint

Thanks for cleaning out the ^ leading underscore.

--D

>  
>  status=0
>  exit
> -- 
> 2.18.0
> 
> 
> 

Re: [PATCH v2 1/2] xfs/029: filter out "extended-header: cycle: 1" from output

[Yang Xu]

on 2020/02/21 7:30, Darrick J. Wong wrote:
> On Thu, Feb 20, 2020 at 03:58:47PM +0800, Yang Xu wrote:
>> When I test this case(default lsunit 256k), this case will fail,
>> as below:
>> cycle: 1        version: 2              lsn: 1,0        tail_lsn: 1,0
>> length of Log Record: 258048    prev offset: -1         num ops: 1
>>
>> ...
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> extended-header: cycle: 1
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ...
>>
>> It reports this info because xfs_logprint only read 32k header every time, so it
>> needs to read more times. We can filter this useless info.
>>
>> common/log also has _filter_logprint function. only library function is
>> prefixed with "_", remove '_'.
>>
>> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
>> ---
>>   tests/xfs/029 | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/xfs/029 b/tests/xfs/029
>> index f532a21b..dbe700ab 100755
>> --- a/tests/xfs/029
>> +++ b/tests/xfs/029
>> @@ -19,7 +19,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
>>   . ./common/rc
>>   . ./common/filter
>>   
>> -_filter_logprint()
>> +filter_logprint()
>>   {
>>   	perl -ne '
>>   	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
>> @@ -31,6 +31,8 @@ _filter_logprint()
>>               s/(length of Log Record:) \d+/$1 <LEN>/;
>>               s/version: \d/version: <VERN>/;
>>   	    s/h_size: \d+/h_size: <H_SIZE>/;
>> +	    s/^~+[\r|\n]+$//;
>> +	    s/extended-header: cycle: 1[\r|\n]+$//;
> 
> I guess this works, but do you want to delete this line for line with
> "extended-header: cycle: <some number>"?
Yes, because this line happens depend on log size(every 32k print a 
line, exclude the first, so 256k prints 7 line). This case is design to
test mkfs log(internal/external) zeroing. IMO, this line doesn't matter
unless we want to test 32k read header(If so, specify -lsunit=128, but I 
want to keep origal design).

Best Regards
Yang Xu
> 
>>   	    print;
>>   	'
>>   }
>> @@ -45,7 +47,7 @@ echo
>>   _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
>>   
>>   echo
>> -_scratch_xfs_logprint | _filter_logprint
>> +_scratch_xfs_logprint | filter_logprint
> 
> Thanks for cleaning out the ^ leading underscore.
> 
> --D
> 
>>   
>>   status=0
>>   exit
>> -- 
>> 2.18.0
>>
>>
>>
> 
>