From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Rename the @errors_found variable to @corruptions_found to make it
more explicit that we're tracking fs corruption issues. Add a new
str_corrupt() function to handle communications that fall under this new
corruption classification. str_error() now exists to log runtime errors
that do not have an associated errno code.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
scrub/common.c | 12 ++++++++----
scrub/common.h | 3 +++
scrub/phase4.c | 2 +-
scrub/phase5.c | 2 +-
scrub/phase6.c | 6 +++---
scrub/scrub.c | 6 +++---
scrub/xfs_scrub.c | 20 ++++++++++++++------
scrub/xfs_scrub.h | 2 +-
8 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/scrub/common.c b/scrub/common.c
index 90fbad64..b1c6abd1 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -36,7 +36,7 @@ xfs_scrub_excessive_errors(
bool ret;
pthread_mutex_lock(&ctx->lock);
- ret = ctx->max_errors > 0 && ctx->errors_found >= ctx->max_errors;
+ ret = ctx->max_errors > 0 && ctx->corruptions_found >= ctx->max_errors;
pthread_mutex_unlock(&ctx->lock);
return ret;
@@ -50,6 +50,10 @@ static struct {
.string = "Error",
.loglevel = LOG_ERR,
},
+ [S_CORRUPT] = {
+ .string = "Corruption",
+ .loglevel = LOG_ERR,
+ },
[S_WARN] = {
.string = "Warning",
.loglevel = LOG_WARNING,
@@ -121,10 +125,10 @@ __str_out(
fflush(stream);
out_record:
- if (error) /* A syscall failed */
+ if (error || level == S_ERROR) /* A syscall failed */
ctx->runtime_errors++;
- else if (level == S_ERROR)
- ctx->errors_found++;
+ else if (level == S_CORRUPT)
+ ctx->corruptions_found++;
else if (level == S_WARN)
ctx->warnings_found++;
else if (level == S_REPAIR)
diff --git a/scrub/common.h b/scrub/common.h
index ef4cf439..b1f2ea2c 100644
--- a/scrub/common.h
+++ b/scrub/common.h
@@ -17,6 +17,7 @@ bool xfs_scrub_excessive_errors(struct scrub_ctx *ctx);
enum error_level {
S_ERROR = 0,
+ S_CORRUPT,
S_WARN,
S_INFO,
S_REPAIR,
@@ -30,6 +31,8 @@ void __str_out(struct scrub_ctx *ctx, const char *descr, enum error_level level,
__str_out(ctx, str, S_ERROR, errno, __FILE__, __LINE__, NULL)
#define str_liberror(ctx, error, str) \
__str_out(ctx, str, S_ERROR, error, __FILE__, __LINE__, NULL)
+#define str_corrupt(ctx, str, ...) \
+ __str_out(ctx, str, S_CORRUPT, 0, __FILE__, __LINE__, __VA_ARGS__)
#define str_error(ctx, str, ...) \
__str_out(ctx, str, S_ERROR, 0, __FILE__, __LINE__, __VA_ARGS__)
#define str_warn(ctx, str, ...) \
diff --git a/scrub/phase4.c b/scrub/phase4.c
index eb30c189..1cf3f6b7 100644
--- a/scrub/phase4.c
+++ b/scrub/phase4.c
@@ -99,7 +99,7 @@ xfs_process_action_items(
workqueue_destroy(&wq);
pthread_mutex_lock(&ctx->lock);
- if (moveon && ctx->errors_found == 0 && want_fstrim) {
+ if (moveon && ctx->corruptions_found == 0 && want_fstrim) {
fstrim(ctx);
progress_add(1);
}
diff --git a/scrub/phase5.c b/scrub/phase5.c
index 27941907..dc0ee5e8 100644
--- a/scrub/phase5.c
+++ b/scrub/phase5.c
@@ -336,7 +336,7 @@ xfs_scan_connections(
bool moveon = true;
bool ret;
- if (ctx->errors_found) {
+ if (ctx->corruptions_found) {
str_info(ctx, ctx->mntpoint,
_("Filesystem has errors, skipping connectivity checks."));
return true;
diff --git a/scrub/phase6.c b/scrub/phase6.c
index fccd18e9..bb159641 100644
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -233,7 +233,7 @@ _("found unexpected realtime attr fork extent."));
}
if (bitmap_test(bmp, bmap->bm_physical, bmap->bm_length))
- str_error(ctx, descr,
+ str_corrupt(ctx, descr,
_("media error in extended attribute data."));
return true;
@@ -389,7 +389,7 @@ report_ioerr_fsmap(
snprintf(buf, DESCR_BUFSZ, _("disk offset %"PRIu64),
(uint64_t)map->fmr_physical + err_off);
type = xfs_decode_special_owner(map->fmr_owner);
- str_error(ctx, buf, _("media error in %s."), type);
+ str_corrupt(ctx, buf, _("media error in %s."), type);
}
/* Report extent maps */
@@ -400,7 +400,7 @@ report_ioerr_fsmap(
map->fmr_owner, 0, " %s",
attr ? _("extended attribute") :
_("file data"));
- str_error(ctx, buf, _("media error in extent map"));
+ str_corrupt(ctx, buf, _("media error in extent map"));
}
/*
diff --git a/scrub/scrub.c b/scrub/scrub.c
index 0293ce30..75a64efa 100644
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -188,7 +188,7 @@ _("Kernel bug! errno=%d"), code);
*/
if (is_corrupt(meta) || xref_disagrees(meta)) {
if (ctx->mode < SCRUB_MODE_REPAIR) {
- str_error(ctx, buf,
+ str_corrupt(ctx, buf,
_("Repairs are required."));
return CHECK_DONE;
}
@@ -727,7 +727,7 @@ _("Filesystem is shut down, aborting."));
/* fall through */
case EINVAL:
/* Kernel doesn't know how to repair this? */
- str_error(ctx, buf,
+ str_corrupt(ctx, buf,
_("Don't know how to fix; offline repair required."));
return CHECK_DONE;
case EROFS:
@@ -768,7 +768,7 @@ _("Read-only filesystem; cannot make changes."));
*/
if (!(repair_flags & XRM_COMPLAIN_IF_UNFIXED))
return CHECK_RETRY;
- str_error(ctx, buf,
+ str_corrupt(ctx, buf,
_("Repair unsuccessful; offline repair required."));
} else {
/* Clean operation, no corruption detected. */
diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index c7305694..222daae1 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -513,17 +513,25 @@ report_outcome(
{
unsigned long long total_errors;
- total_errors = ctx->errors_found + ctx->runtime_errors;
+ total_errors = ctx->corruptions_found + ctx->runtime_errors;
if (total_errors == 0 && ctx->warnings_found == 0) {
log_info(ctx, _("No problems found."));
return;
}
- if (total_errors > 0) {
- fprintf(stderr, _("%s: errors found: %llu\n"), ctx->mntpoint,
- total_errors);
- log_err(ctx, _("errors found: %llu"), total_errors);
+ if (ctx->corruptions_found > 0) {
+ fprintf(stderr, _("%s: corruptions found: %llu\n"),
+ ctx->mntpoint, ctx->corruptions_found);
+ log_err(ctx, _("corruptions found: %llu"),
+ ctx->corruptions_found);
+ }
+
+ if (ctx->runtime_errors > 0) {
+ fprintf(stderr, _("%s: operational errors found: %llu\n"),
+ ctx->mntpoint, ctx->runtime_errors);
+ log_err(ctx, _("operational errors found: %llu"),
+ ctx->runtime_errors);
}
if (ctx->warnings_found > 0) {
@@ -745,7 +753,7 @@ main(
report_modifications(&ctx);
report_outcome(&ctx);
- if (ctx.errors_found) {
+ if (ctx.corruptions_found) {
if (ctx.error_action == ERRORS_SHUTDOWN)
xfs_shutdown_fs(&ctx);
ret |= SCRUB_RET_CORRUPT;
diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index 37d78f61..5abc41fd 100644
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -73,7 +73,7 @@ struct scrub_ctx {
struct xfs_action_list *action_lists;
unsigned long long max_errors;
unsigned long long runtime_errors;
- unsigned long long errors_found;
+ unsigned long long corruptions_found;
unsigned long long warnings_found;
unsigned long long inodes_checked;
unsigned long long bytes_checked;
