diff mbox series

[3/5] xfs_scrub: report repair activities on stdout, not stderr

Message ID 157177001031.1458930.10794386697707805480.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series xfsprogs: random fixes | expand

Commit Message

Darrick J. Wong Oct. 22, 2019, 6:46 p.m. UTC 
From: Darrick J. Wong <darrick.wong@oracle.com>

Reduce the severity of reports about successful metadata repairs.  We
fixed the problem, so there's no action necessary on the part of the
system admin.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 scrub/common.c |    2 +-
 scrub/common.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Sandeen Nov. 1, 2019, 6:26 p.m. UTC | #1 
On 10/22/19 1:46 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Reduce the severity of reports about successful metadata repairs.  We
> fixed the problem, so there's no action necessary on the part of the
> system admin.

Hm, ok.  "we found corruption" seems quite important, but I guess it's
not an operational error of the utility.  *shrug*

> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  scrub/common.c |    2 +-
>  scrub/common.h |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/scrub/common.c b/scrub/common.c
> index b41f443d..7632a8d8 100644
> --- a/scrub/common.c
> +++ b/scrub/common.c
> @@ -48,7 +48,7 @@ static struct {
>  } err_levels[] = {
>  	[S_ERROR]  = { .string = "Error",	.loglevel = LOG_ERR },
>  	[S_WARN]   = { .string = "Warning",	.loglevel = LOG_WARNING },
> -	[S_REPAIR] = { .string = "Repaired",	.loglevel = LOG_WARNING },
> +	[S_REPAIR] = { .string = "Repaired",	.loglevel = LOG_INFO },
>  	[S_INFO]   = { .string = "Info",	.loglevel = LOG_INFO },
>  	[S_PREEN]  = { .string = "Optimized",	.loglevel = LOG_INFO }

My OCD wants this in the same order as error_level, I'll change that
on commit if it's ok w/ you.  And if I remember.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

>  };
> diff --git a/scrub/common.h b/scrub/common.h
> index 9a37e9ed..ef4cf439 100644
> --- a/scrub/common.h
> +++ b/scrub/common.h
> @@ -18,8 +18,8 @@ bool xfs_scrub_excessive_errors(struct scrub_ctx *ctx);
>  enum error_level {
>  	S_ERROR	= 0,
>  	S_WARN,
> -	S_REPAIR,
>  	S_INFO,
> +	S_REPAIR,
>  	S_PREEN,
>  };
>  
>
Darrick J. Wong Nov. 1, 2019, 6:42 p.m. UTC | #2 
On Fri, Nov 01, 2019 at 01:26:49PM -0500, Eric Sandeen wrote:
> On 10/22/19 1:46 PM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Reduce the severity of reports about successful metadata repairs.  We
> > fixed the problem, so there's no action necessary on the part of the
> > system admin.
> 
> Hm, ok.  "we found corruption" seems quite important, but I guess it's
> not an operational error of the utility.  *shrug*

We *fixed* corruption, meaning that the fs is ok now.

If we left corruption behind (either because the user gave us "-n" or
the repair failed) then we still yell about it on stderr.

> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  scrub/common.c |    2 +-
> >  scrub/common.h |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > 
> > diff --git a/scrub/common.c b/scrub/common.c
> > index b41f443d..7632a8d8 100644
> > --- a/scrub/common.c
> > +++ b/scrub/common.c
> > @@ -48,7 +48,7 @@ static struct {
> >  } err_levels[] = {
> >  	[S_ERROR]  = { .string = "Error",	.loglevel = LOG_ERR },
> >  	[S_WARN]   = { .string = "Warning",	.loglevel = LOG_WARNING },
> > -	[S_REPAIR] = { .string = "Repaired",	.loglevel = LOG_WARNING },
> > +	[S_REPAIR] = { .string = "Repaired",	.loglevel = LOG_INFO },
> >  	[S_INFO]   = { .string = "Info",	.loglevel = LOG_INFO },
> >  	[S_PREEN]  = { .string = "Optimized",	.loglevel = LOG_INFO }
> 
> My OCD wants this in the same order as error_level, I'll change that
> on commit if it's ok w/ you.  And if I remember.

<nod>

--D

> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> 
> >  };
> > diff --git a/scrub/common.h b/scrub/common.h
> > index 9a37e9ed..ef4cf439 100644
> > --- a/scrub/common.h
> > +++ b/scrub/common.h
> > @@ -18,8 +18,8 @@ bool xfs_scrub_excessive_errors(struct scrub_ctx *ctx);
> >  enum error_level {
> >  	S_ERROR	= 0,
> >  	S_WARN,
> > -	S_REPAIR,
> >  	S_INFO,
> > +	S_REPAIR,
> >  	S_PREEN,
> >  };
> >  
> >
diff mbox series

Patch

diff --git a/scrub/common.c b/scrub/common.c
index b41f443d..7632a8d8 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -48,7 +48,7 @@  static struct {
 } err_levels[] = {
 	[S_ERROR]  = { .string = "Error",	.loglevel = LOG_ERR },
 	[S_WARN]   = { .string = "Warning",	.loglevel = LOG_WARNING },
-	[S_REPAIR] = { .string = "Repaired",	.loglevel = LOG_WARNING },
+	[S_REPAIR] = { .string = "Repaired",	.loglevel = LOG_INFO },
 	[S_INFO]   = { .string = "Info",	.loglevel = LOG_INFO },
 	[S_PREEN]  = { .string = "Optimized",	.loglevel = LOG_INFO }
 };
diff --git a/scrub/common.h b/scrub/common.h
index 9a37e9ed..ef4cf439 100644
--- a/scrub/common.h
+++ b/scrub/common.h
@@ -18,8 +18,8 @@  bool xfs_scrub_excessive_errors(struct scrub_ctx *ctx);
 enum error_level {
 	S_ERROR	= 0,
 	S_WARN,
-	S_REPAIR,
 	S_INFO,
+	S_REPAIR,
 	S_PREEN,
 };