diff mbox

xfs/098: fix xfs_repair on newer xfsprogs

Message ID 1472116951-3317-1-git-send-email-yangx.jy@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Xiao Yang Aug. 25, 2016, 9:22 a.m. UTC
Make sure xfs_repair can't clear the log by default when it is corrupted.
xfs_repair always and only clear the log when the -L parameter is specified.
This has updated by:
Commit f2053bc ("xfs_repair: don't clear the log by default")

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 tests/xfs/098 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Zorro Lang Aug. 25, 2016, 12:09 p.m. UTC | #1
On Thu, Aug 25, 2016 at 05:22:31PM +0800, Xiao Yang wrote:
> Make sure xfs_repair can't clear the log by default when it is corrupted.
> xfs_repair always and only clear the log when the -L parameter is specified.
> This has updated by:
> Commit f2053bc ("xfs_repair: don't clear the log by default")
> 
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  tests/xfs/098 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/xfs/098 b/tests/xfs/098
> index d91d617..0fe8d93 100755
> --- a/tests/xfs/098
> +++ b/tests/xfs/098
> @@ -93,7 +93,9 @@ echo "+ mount image"
>  _scratch_mount 2>/dev/null && _fail "mount should not succeed"
>  
>  echo "+ repair fs"
> -_scratch_xfs_repair >> $seqres.full 2>&1
> +_scratch_xfs_repair >> $seqres.full 2>&1 && _fail "xfs_repair should not succeed without -L option"

Hi,

If you make it fail at here, this case can't run for old xfsprogs(without
commit f2053bc).

> +
> +_scratch_xfs_repair -L >> $seqres.full 2>&1

For compatibility, maybe you can use "-L" directly. Or use -L
after _scratch_xfs_repair return error.

Thanks,
Zorro

>  
>  echo "+ mount image (2)"
>  _scratch_mount
> -- 
> 1.8.3.1
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darrick J. Wong Aug. 25, 2016, 3:40 p.m. UTC | #2
On Thu, Aug 25, 2016 at 08:09:03PM +0800, Zorro Lang wrote:
> On Thu, Aug 25, 2016 at 05:22:31PM +0800, Xiao Yang wrote:
> > Make sure xfs_repair can't clear the log by default when it is corrupted.
> > xfs_repair always and only clear the log when the -L parameter is specified.
> > This has updated by:
> > Commit f2053bc ("xfs_repair: don't clear the log by default")
> > 
> > Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> > ---
> >  tests/xfs/098 | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/xfs/098 b/tests/xfs/098
> > index d91d617..0fe8d93 100755
> > --- a/tests/xfs/098
> > +++ b/tests/xfs/098
> > @@ -93,7 +93,9 @@ echo "+ mount image"
> >  _scratch_mount 2>/dev/null && _fail "mount should not succeed"
> >  
> >  echo "+ repair fs"
> > -_scratch_xfs_repair >> $seqres.full 2>&1
> > +_scratch_xfs_repair >> $seqres.full 2>&1 && _fail "xfs_repair should not succeed without -L option"
> 
> Hi,
> 
> If you make it fail at here, this case can't run for old xfsprogs(without
> commit f2053bc).
> 
> > +
> > +_scratch_xfs_repair -L >> $seqres.full 2>&1
> 
> For compatibility, maybe you can use "-L" directly. Or use -L
> after _scratch_xfs_repair return error.

I suggest _repair_scratch_fs.

--D

> 
> Thanks,
> Zorro
> 
> >  
> >  echo "+ mount image (2)"
> >  _scratch_mount
> > -- 
> > 1.8.3.1
> > 
> > 
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe fstests" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zorro Lang Aug. 25, 2016, 4:32 p.m. UTC | #3
On Thu, Aug 25, 2016 at 08:40:52AM -0700, Darrick J. Wong wrote:
> On Thu, Aug 25, 2016 at 08:09:03PM +0800, Zorro Lang wrote:
> > On Thu, Aug 25, 2016 at 05:22:31PM +0800, Xiao Yang wrote:
> > > Make sure xfs_repair can't clear the log by default when it is corrupted.
> > > xfs_repair always and only clear the log when the -L parameter is specified.
> > > This has updated by:
> > > Commit f2053bc ("xfs_repair: don't clear the log by default")
> > > 
> > > Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> > > ---
> > >  tests/xfs/098 | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/tests/xfs/098 b/tests/xfs/098
> > > index d91d617..0fe8d93 100755
> > > --- a/tests/xfs/098
> > > +++ b/tests/xfs/098
> > > @@ -93,7 +93,9 @@ echo "+ mount image"
> > >  _scratch_mount 2>/dev/null && _fail "mount should not succeed"
> > >  
> > >  echo "+ repair fs"
> > > -_scratch_xfs_repair >> $seqres.full 2>&1
> > > +_scratch_xfs_repair >> $seqres.full 2>&1 && _fail "xfs_repair should not succeed without -L option"
> > 
> > Hi,
> > 
> > If you make it fail at here, this case can't run for old xfsprogs(without
> > commit f2053bc).
> > 
> > > +
> > > +_scratch_xfs_repair -L >> $seqres.full 2>&1
> > 
> > For compatibility, maybe you can use "-L" directly. Or use -L
> > after _scratch_xfs_repair return error.
> 
> I suggest _repair_scratch_fs.

Oh, you're right. You already wrote a common function to do that...
Thanks for remind me:)

Thanks,
Zorro

> 
> --D
> 
> > 
> > Thanks,
> > Zorro
> > 
> > >  
> > >  echo "+ mount image (2)"
> > >  _scratch_mount
> > > -- 
> > > 1.8.3.1
> > > 
> > > 
> > > 
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe fstests" in
> > > the body of a message to majordomo@vger.kernel.org
> > > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Xiao Yang Aug. 26, 2016, 3:32 a.m. UTC | #4
于 2016/08/25 23:40, Darrick J. Wong 写道:
> On Thu, Aug 25, 2016 at 08:09:03PM +0800, Zorro Lang wrote:
>> On Thu, Aug 25, 2016 at 05:22:31PM +0800, Xiao Yang wrote:
>>> Make sure xfs_repair can't clear the log by default when it is corrupted.
>>> xfs_repair always and only clear the log when the -L parameter is specified.
>>> This has updated by:
>>> Commit f2053bc ("xfs_repair: don't clear the log by default")
>>>
>>> Signed-off-by: Xiao Yang<yangx.jy@cn.fujitsu.com>
>>> ---
>>>   tests/xfs/098 | 4 +++-
>>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tests/xfs/098 b/tests/xfs/098
>>> index d91d617..0fe8d93 100755
>>> --- a/tests/xfs/098
>>> +++ b/tests/xfs/098
>>> @@ -93,7 +93,9 @@ echo "+ mount image"
>>>   _scratch_mount 2>/dev/null&&  _fail "mount should not succeed"
>>>
>>>   echo "+ repair fs"
>>> -_scratch_xfs_repair>>  $seqres.full 2>&1
>>> +_scratch_xfs_repair>>  $seqres.full 2>&1&&  _fail "xfs_repair should not succeed without -L option"
>> Hi,
>>
>> If you make it fail at here, this case can't run for old xfsprogs(without
>> commit f2053bc).
>>
>>> +
>>> +_scratch_xfs_repair -L>>  $seqres.full 2>&1
>> For compatibility, maybe you can use "-L" directly. Or use -L
>> after _scratch_xfs_repair return error.
> I suggest _repair_scratch_fs.
>
> --D
>
Hi Darrick
I changed _repair_scratch_fs because xfs_repair return 1 when log is 
corrupted.

Thanks for your review.

Regards,
Xiao Yang

>> Thanks,
>> Zorro
>>
>>>
>>>   echo "+ mount image (2)"
>>>   _scratch_mount
>>> -- 
>>> 1.8.3.1
>>>
>>>
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe fstests" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>



--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darrick J. Wong Aug. 26, 2016, 4:18 p.m. UTC | #5
On Fri, Aug 26, 2016 at 11:32:56AM +0800, Xiao Yang wrote:
> 于 2016/08/25 23:40, Darrick J. Wong 写道:
> >On Thu, Aug 25, 2016 at 08:09:03PM +0800, Zorro Lang wrote:
> >>On Thu, Aug 25, 2016 at 05:22:31PM +0800, Xiao Yang wrote:
> >>>Make sure xfs_repair can't clear the log by default when it is corrupted.
> >>>xfs_repair always and only clear the log when the -L parameter is specified.
> >>>This has updated by:
> >>>Commit f2053bc ("xfs_repair: don't clear the log by default")
> >>>
> >>>Signed-off-by: Xiao Yang<yangx.jy@cn.fujitsu.com>
> >>>---
> >>>  tests/xfs/098 | 4 +++-
> >>>  1 file changed, 3 insertions(+), 1 deletion(-)
> >>>
> >>>diff --git a/tests/xfs/098 b/tests/xfs/098
> >>>index d91d617..0fe8d93 100755
> >>>--- a/tests/xfs/098
> >>>+++ b/tests/xfs/098
> >>>@@ -93,7 +93,9 @@ echo "+ mount image"
> >>>  _scratch_mount 2>/dev/null&&  _fail "mount should not succeed"
> >>>
> >>>  echo "+ repair fs"
> >>>-_scratch_xfs_repair>>  $seqres.full 2>&1
> >>>+_scratch_xfs_repair>>  $seqres.full 2>&1&&  _fail "xfs_repair should not succeed without -L option"
> >>Hi,
> >>
> >>If you make it fail at here, this case can't run for old xfsprogs(without
> >>commit f2053bc).
> >>
> >>>+
> >>>+_scratch_xfs_repair -L>>  $seqres.full 2>&1
> >>For compatibility, maybe you can use "-L" directly. Or use -L
> >>after _scratch_xfs_repair return error.
> >I suggest _repair_scratch_fs.
> >
> >--D
> >
> Hi Darrick
> I changed _repair_scratch_fs because xfs_repair return 1 when log is
> corrupted.

xfs_repair returns 2 when the log is corrupted, 1 when there's corruption left
to be fixed *or* some kind of operation error happened, and 0 if either it
found nothing wrong or all the corruptions were fixed.  The manpage lies.

(Proceeding on to the rest of the messages in this thread...)

--D

> Thanks for your review.
> 
> Regards,
> Xiao Yang
> 
> >>Thanks,
> >>Zorro
> >>
> >>>
> >>>  echo "+ mount image (2)"
> >>>  _scratch_mount
> >>>-- 
> >>>1.8.3.1
> >>>
> >>>
> >>>
> >>>--
> >>>To unsubscribe from this list: send the line "unsubscribe fstests" in
> >>>the body of a message to majordomo@vger.kernel.org
> >>>More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >
> >
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/tests/xfs/098 b/tests/xfs/098
index d91d617..0fe8d93 100755
--- a/tests/xfs/098
+++ b/tests/xfs/098
@@ -93,7 +93,9 @@  echo "+ mount image"
 _scratch_mount 2>/dev/null && _fail "mount should not succeed"
 
 echo "+ repair fs"
-_scratch_xfs_repair >> $seqres.full 2>&1
+_scratch_xfs_repair >> $seqres.full 2>&1 && _fail "xfs_repair should not succeed without -L option"
+
+_scratch_xfs_repair -L >> $seqres.full 2>&1
 
 echo "+ mount image (2)"
 _scratch_mount