* [PATCH 0/3] xfs_scrub: media scan entire disks
@ 2019-10-22 18:49 Darrick J. Wong
2019-10-22 18:50 ` [PATCH 1/3] xfs_scrub: implement background mode for phase 6 Darrick J. Wong
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Darrick J. Wong @ 2019-10-22 18:49 UTC (permalink / raw)
To: sandeen, darrick.wong; +Cc: linux-xfs
Hi all,
Enable the administrator to request a full-disk media scan so that they
can look for media problems in the free space, not just allocated file
data.
If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy!
Comments and questions are, as always, welcome.
--D
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-scan-everything
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] xfs_scrub: implement background mode for phase 6 2019-10-22 18:49 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong @ 2019-10-22 18:50 ` Darrick J. Wong 2019-10-22 18:50 ` [PATCH 2/3] xfs_scrub: perform media scans of entire devices Darrick J. Wong 2019-10-22 18:50 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 2 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2019-10-22 18:50 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs, Allison Collins From: Darrick J. Wong <darrick.wong@oracle.com> Phase 6 doesn't implement background mode, which means that it doesn't run in single-threaded mode with one -b and it doesn't sleep between calls with multiple -b like every other phase does. It also doesn't restrict the amount of work per kernel call, which is a key part of throttling. Wire up the necessary pieces to make it behave like the man page says it should. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Allison Collins <allison.henderson@oracle.com> --- scrub/read_verify.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scrub/read_verify.c b/scrub/read_verify.c index a963a3fd..82605c8c 100644 --- a/scrub/read_verify.c +++ b/scrub/read_verify.c @@ -32,7 +32,19 @@ * because that's the biggest SCSI VERIFY(16) we dare to send. */ #define RVP_IO_MAX_SIZE (33554432) -#define RVP_IO_MAX_SECTORS (RVP_IO_MAX_SIZE >> BBSHIFT) + +/* + * If we're running in the background then we perform IO in 128k chunks + * to reduce the load on the IO subsystem. + */ +#define RVP_BACKGROUND_IO_MAX_SIZE (131072) + +/* What's the real maximum IO size? */ +static inline unsigned int +rvp_io_max_size(void) +{ + return bg_mode > 0 ? RVP_BACKGROUND_IO_MAX_SIZE : RVP_IO_MAX_SIZE; +} /* Tolerate 64k holes in adjacent read verify requests. */ #define RVP_IO_BATCH_LOCALITY (65536) @@ -89,7 +101,7 @@ read_verify_pool_alloc( */ if (miniosz % disk->d_lbasize) return EINVAL; - if (RVP_IO_MAX_SIZE % miniosz) + if (rvp_io_max_size() % miniosz) return EINVAL; rvp = calloc(1, sizeof(struct read_verify_pool)); @@ -97,7 +109,7 @@ read_verify_pool_alloc( return errno; ret = posix_memalign((void **)&rvp->readbuf, page_size, - RVP_IO_MAX_SIZE); + rvp_io_max_size()); if (ret) goto out_free; ret = ptcounter_alloc(verifier_threads, &rvp->verified_bytes); @@ -181,7 +193,7 @@ read_verify( if (rvp->runtime_error) return; - io_max_size = RVP_IO_MAX_SIZE; + io_max_size = rvp_io_max_size(); while (rv->io_length > 0) { read_error = 0; @@ -257,6 +269,7 @@ read_verify( verified += sz; rv->io_start += sz; rv->io_length -= sz; + background_sleep(); } free(rv); ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] xfs_scrub: perform media scans of entire devices 2019-10-22 18:49 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong 2019-10-22 18:50 ` [PATCH 1/3] xfs_scrub: implement background mode for phase 6 Darrick J. Wong @ 2019-10-22 18:50 ` Darrick J. Wong 2019-11-06 20:15 ` Eric Sandeen 2019-10-22 18:50 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 2 siblings, 1 reply; 10+ messages in thread From: Darrick J. Wong @ 2019-10-22 18:50 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs, Allison Collins From: Darrick J. Wong <darrick.wong@oracle.com> Add a new feature to xfs_scrub where specifying multiple -x will cause it to perform a media scan of the entire disk, not just the file data areas. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Allison Collins <allison.henderson@oracle.com> --- man/man8/xfs_scrub.8 | 3 +++ scrub/phase6.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++---- scrub/phase7.c | 5 ++++ scrub/xfs_scrub.c | 4 ++- scrub/xfs_scrub.h | 1 + 5 files changed, 66 insertions(+), 7 deletions(-) diff --git a/man/man8/xfs_scrub.8 b/man/man8/xfs_scrub.8 index e881ae76..2cdec380 100644 --- a/man/man8/xfs_scrub.8 +++ b/man/man8/xfs_scrub.8 @@ -97,6 +97,9 @@ Prints the version number and exits. .TP .B \-x Read all file data extents to look for disk errors. +If this option is given more than once, scrub all disk contents. +If this option is given more than twice, report errors even if they have not +yet caused data loss. .B xfs_scrub will issue O_DIRECT reads to the block device directly. If the block device is a SCSI disk, it will instead issue READ VERIFY commands diff --git a/scrub/phase6.c b/scrub/phase6.c index aae6b7d8..9ddddef1 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -188,7 +188,9 @@ report_data_loss( int ret; /* Only report errors for real extents. */ - if (bmap->bm_flags & (BMV_OF_PREALLOC | BMV_OF_DELALLOC)) + if (scrub_data < 3 && (bmap->bm_flags & BMV_OF_PREALLOC)) + return true; + if (bmap->bm_flags & BMV_OF_DELALLOC) return true; if (fsx->fsx_xflags & FS_XFLAG_REALTIME) @@ -376,7 +378,7 @@ report_ioerr_fsmap( uint64_t err_off; /* Don't care about unwritten extents. */ - if (map->fmr_flags & FMR_OF_PREALLOC) + if (scrub_data < 3 && (map->fmr_flags & FMR_OF_PREALLOC)) return true; if (err_physical > map->fmr_physical) @@ -603,6 +605,49 @@ remember_ioerr( str_liberror(ctx, ret, _("setting bad block bitmap")); } +/* Schedule an entire disk for read verification. */ +static int +verify_entire_disk( + struct read_verify_pool *rvp, + struct disk *disk, + struct media_verify_state *vs) +{ + return read_verify_schedule_io(rvp, 0, disk->d_size, vs); +} + +/* Scan every part of every disk. */ +static bool +verify_all_disks( + struct scrub_ctx *ctx, + struct media_verify_state *vs) +{ + int ret; + + ret = verify_entire_disk(vs->rvp_data, ctx->datadev, vs); + if (ret) { + str_liberror(ctx, ret, _("scheduling datadev verify")); + return false; + } + + if (ctx->logdev) { + ret = verify_entire_disk(vs->rvp_log, ctx->logdev, vs); + if (ret) { + str_liberror(ctx, ret, _("scheduling logdev verify")); + return false; + } + } + + if (ctx->rtdev) { + ret = verify_entire_disk(vs->rvp_realtime, ctx->rtdev, vs); + if (ret) { + str_liberror(ctx, ret, _("scheduling rtdev verify")); + return false; + } + } + + return true; +} + /* * Read verify all the file data blocks in a filesystem. Since XFS doesn't * do data checksums, we trust that the underlying storage will pass back @@ -658,7 +703,11 @@ xfs_scan_blocks( goto out_logpool; } } - moveon = xfs_scan_all_spacemaps(ctx, xfs_check_rmap, &vs); + + if (scrub_data > 1) + moveon = verify_all_disks(ctx, &vs); + else + moveon = xfs_scan_all_spacemaps(ctx, xfs_check_rmap, &vs); if (!moveon) goto out_rtpool; @@ -730,8 +779,9 @@ xfs_estimate_verify_work( if (!moveon) return moveon; - *items = cvt_off_fsb_to_b(&ctx->mnt, - (d_blocks - d_bfree) + (r_blocks - r_bfree)); + *items = cvt_off_fsb_to_b(&ctx->mnt, d_blocks + r_blocks); + if (scrub_data == 1) + *items -= cvt_off_fsb_to_b(&ctx->mnt, d_bfree + r_bfree); *nr_threads = disk_heads(ctx->datadev); *rshift = 20; return moveon; diff --git a/scrub/phase7.c b/scrub/phase7.c index bc959f5b..570ceb3f 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -255,6 +255,11 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), double b1, b2; char *b1u, *b2u; + if (scrub_data > 1) { + used_data = cvt_off_fsb_to_b(&ctx->mnt, d_blocks); + used_rt = cvt_off_fsb_to_b(&ctx->mnt, r_blocks); + } + b1 = auto_space_units(used_data + used_rt, &b1u); b2 = auto_space_units(ctx->bytes_checked, &b2u); fprintf(stdout, diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index 9945c7f4..b2e58108 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -139,7 +139,7 @@ unsigned int force_nr_threads; bool verbose; /* Should we scrub the data blocks? */ -static bool scrub_data; +int scrub_data; /* Size of a memory page. */ long page_size; @@ -668,7 +668,7 @@ main( fflush(stdout); return SCRUB_RET_SUCCESS; case 'x': - scrub_data = true; + scrub_data++; break; case '?': /* fall through */ diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h index 61831c92..ed0e63b8 100644 --- a/scrub/xfs_scrub.h +++ b/scrub/xfs_scrub.h @@ -21,6 +21,7 @@ extern bool want_fstrim; extern bool stderr_isatty; extern bool stdout_isatty; extern bool is_service; +extern int scrub_data; enum scrub_mode { SCRUB_MODE_DRY_RUN, ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] xfs_scrub: perform media scans of entire devices 2019-10-22 18:50 ` [PATCH 2/3] xfs_scrub: perform media scans of entire devices Darrick J. Wong @ 2019-11-06 20:15 ` Eric Sandeen 2019-11-06 20:22 ` Darrick J. Wong 0 siblings, 1 reply; 10+ messages in thread From: Eric Sandeen @ 2019-11-06 20:15 UTC (permalink / raw) To: Darrick J. Wong; +Cc: linux-xfs, Allison Collins On 10/22/19 1:50 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Add a new feature to xfs_scrub where specifying multiple -x will cause > it to perform a media scan of the entire disk, not just the file data > areas. Hm.... convince me why this is useful? It's likely that any such block will get remapped when it's used anyway, right? What does this help? > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > Reviewed-by: Allison Collins <allison.henderson@oracle.com> > --- > man/man8/xfs_scrub.8 | 3 +++ > scrub/phase6.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++---- > scrub/phase7.c | 5 ++++ > scrub/xfs_scrub.c | 4 ++- > scrub/xfs_scrub.h | 1 + > 5 files changed, 66 insertions(+), 7 deletions(-) > > > diff --git a/man/man8/xfs_scrub.8 b/man/man8/xfs_scrub.8 > index e881ae76..2cdec380 100644 > --- a/man/man8/xfs_scrub.8 > +++ b/man/man8/xfs_scrub.8 > @@ -97,6 +97,9 @@ Prints the version number and exits. > .TP > .B \-x > Read all file data extents to look for disk errors. > +If this option is given more than once, scrub all disk contents. This addition doesn't really make clear what -xx does, IMHO. Something more explicit like "look for errors even in freespace?" > +If this option is given more than twice, report errors even if they have not > +yet caused data loss. sooo w/ -xx it'll read freespace but not report errors, with -xxx it will? -Eric ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] xfs_scrub: perform media scans of entire devices 2019-11-06 20:15 ` Eric Sandeen @ 2019-11-06 20:22 ` Darrick J. Wong 0 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2019-11-06 20:22 UTC (permalink / raw) To: Eric Sandeen; +Cc: linux-xfs, Allison Collins On Wed, Nov 06, 2019 at 02:15:43PM -0600, Eric Sandeen wrote: > On 10/22/19 1:50 PM, Darrick J. Wong wrote: > > From: Darrick J. Wong <darrick.wong@oracle.com> > > > > Add a new feature to xfs_scrub where specifying multiple -x will cause > > it to perform a media scan of the entire disk, not just the file data > > areas. > > Hm.... convince me why this is useful? It's likely that any such block > will get remapped when it's used anyway, right? What does this help? It's really only useful as a general media scan, which anyone can do with ddrescue. It could potentially be useful if storage reverts to the old days where writes don't actually remap (flooppies!).... ...eh, let's drop this and the next patch. I don't even think pmem behaves like that. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > Reviewed-by: Allison Collins <allison.henderson@oracle.com> > > --- > > man/man8/xfs_scrub.8 | 3 +++ > > scrub/phase6.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++---- > > scrub/phase7.c | 5 ++++ > > scrub/xfs_scrub.c | 4 ++- > > scrub/xfs_scrub.h | 1 + > > 5 files changed, 66 insertions(+), 7 deletions(-) > > > > > > diff --git a/man/man8/xfs_scrub.8 b/man/man8/xfs_scrub.8 > > index e881ae76..2cdec380 100644 > > --- a/man/man8/xfs_scrub.8 > > +++ b/man/man8/xfs_scrub.8 > > @@ -97,6 +97,9 @@ Prints the version number and exits. > > .TP > > .B \-x > > Read all file data extents to look for disk errors. > > +If this option is given more than once, scrub all disk contents. > > This addition doesn't really make clear what -xx does, IMHO. Something > more explicit like "look for errors even in freespace?" Yeah. > > +If this option is given more than twice, report errors even if they have not > > +yet caused data loss. > > sooo w/ -xx it'll read freespace but not report errors, with -xxx it will? The same as -xx. --D > > -Eric ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] xfs_scrub: relabel verified data block counts in output 2019-10-22 18:49 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong 2019-10-22 18:50 ` [PATCH 1/3] xfs_scrub: implement background mode for phase 6 Darrick J. Wong 2019-10-22 18:50 ` [PATCH 2/3] xfs_scrub: perform media scans of entire devices Darrick J. Wong @ 2019-10-22 18:50 ` Darrick J. Wong 2 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2019-10-22 18:50 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs, Allison Collins From: Darrick J. Wong <darrick.wong@oracle.com> Relabel the count of verified data blocks to make it more obvious that we were only looking for file data. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Allison Collins <allison.henderson@oracle.com> --- scrub/phase7.c | 13 ++++++++----- scrub/xfs_scrub.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scrub/phase7.c b/scrub/phase7.c index 570ceb3f..2622bc45 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -116,6 +116,7 @@ xfs_scan_summary( unsigned long long f_free; bool moveon; bool complain; + bool scrub_all = scrub_data > 1; int ip; int error; @@ -244,14 +245,15 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), } /* - * Complain if the checked block counts are off, which + * Complain if the data file verification block counts are off, which * implies an incomplete check. */ - if (ctx->bytes_checked && + if (scrub_data && (verbose || !within_range(ctx, used_data + used_rt, ctx->bytes_checked, absdiff, 1, 10, - _("verified blocks")))) { + scrub_all ? _("verified blocks") : + _("verified file data blocks")))) { double b1, b2; char *b1u, *b2u; @@ -262,8 +264,9 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), b1 = auto_space_units(used_data + used_rt, &b1u); b2 = auto_space_units(ctx->bytes_checked, &b2u); - fprintf(stdout, -_("%.1f%s data counted; %.1f%s data verified.\n"), + fprintf(stdout, scrub_all ? +_("%.1f%s data counted; %.1f%s disk media verified.\n") : +_("%.1f%s data counted; %.1f%s file data media verified.\n"), b1, b1u, b2, b2u); fflush(stdout); } diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index b2e58108..839528ea 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -432,6 +432,8 @@ run_scrub_phases( /* Turn on certain phases if user said to. */ if (sp->fn == DATASCAN_DUMMY_FN && scrub_data) { sp->fn = xfs_scan_blocks; + if (scrub_data > 1) + sp->descr = _("Verify disk integrity."); } else if (sp->fn == REPAIR_DUMMY_FN && ctx->mode == SCRUB_MODE_REPAIR) { sp->descr = _("Repair filesystem."); ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 0/3] xfs_scrub: media scan entire disks @ 2019-09-25 21:37 Darrick J. Wong 2019-09-25 21:38 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 0 siblings, 1 reply; 10+ messages in thread From: Darrick J. Wong @ 2019-09-25 21:37 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs Hi all, Enable the administrator to request a full-disk media scan so that they can look for media problems in the free space, not just allocated file data. If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below. This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome. --D xfsprogs git tree: https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-scan-everything ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] xfs_scrub: relabel verified data block counts in output 2019-09-25 21:37 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong @ 2019-09-25 21:38 ` Darrick J. Wong 0 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2019-09-25 21:38 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs, Allison Collins From: Darrick J. Wong <darrick.wong@oracle.com> Relabel the count of verified data blocks to make it more obvious that we were only looking for file data. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Allison Collins <allison.henderson@oracle.com> --- scrub/phase7.c | 13 ++++++++----- scrub/xfs_scrub.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scrub/phase7.c b/scrub/phase7.c index 570ceb3f..2622bc45 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -116,6 +116,7 @@ xfs_scan_summary( unsigned long long f_free; bool moveon; bool complain; + bool scrub_all = scrub_data > 1; int ip; int error; @@ -244,14 +245,15 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), } /* - * Complain if the checked block counts are off, which + * Complain if the data file verification block counts are off, which * implies an incomplete check. */ - if (ctx->bytes_checked && + if (scrub_data && (verbose || !within_range(ctx, used_data + used_rt, ctx->bytes_checked, absdiff, 1, 10, - _("verified blocks")))) { + scrub_all ? _("verified blocks") : + _("verified file data blocks")))) { double b1, b2; char *b1u, *b2u; @@ -262,8 +264,9 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), b1 = auto_space_units(used_data + used_rt, &b1u); b2 = auto_space_units(ctx->bytes_checked, &b2u); - fprintf(stdout, -_("%.1f%s data counted; %.1f%s data verified.\n"), + fprintf(stdout, scrub_all ? +_("%.1f%s data counted; %.1f%s disk media verified.\n") : +_("%.1f%s data counted; %.1f%s file data media verified.\n"), b1, b1u, b2, b2u); fflush(stdout); } diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index 46876522..89f6c96a 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -432,6 +432,8 @@ run_scrub_phases( /* Turn on certain phases if user said to. */ if (sp->fn == DATASCAN_DUMMY_FN && scrub_data) { sp->fn = xfs_scan_blocks; + if (scrub_data > 1) + sp->descr = _("Verify disk integrity."); } else if (sp->fn == REPAIR_DUMMY_FN && ctx->mode == SCRUB_MODE_REPAIR) { sp->descr = _("Repair filesystem."); ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 0/3] xfs_scrub: media scan entire disks @ 2019-09-06 3:40 Darrick J. Wong 2019-09-06 3:40 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 0 siblings, 1 reply; 10+ messages in thread From: Darrick J. Wong @ 2019-09-06 3:40 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs Hi all, Enable the administrator to request a full-disk media scan so that they can look for media problems in the free space, not just allocated file data. If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below. This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome. --D xfsprogs git tree: https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-scan-everything ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] xfs_scrub: relabel verified data block counts in output 2019-09-06 3:40 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong @ 2019-09-06 3:40 ` Darrick J. Wong 2019-09-12 23:42 ` Allison Collins 0 siblings, 1 reply; 10+ messages in thread From: Darrick J. Wong @ 2019-09-06 3:40 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs From: Darrick J. Wong <darrick.wong@oracle.com> Relabel the count of verified data blocks to make it more obvious that we were only looking for file data. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- scrub/phase7.c | 13 ++++++++----- scrub/xfs_scrub.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scrub/phase7.c b/scrub/phase7.c index 570ceb3f..2622bc45 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -116,6 +116,7 @@ xfs_scan_summary( unsigned long long f_free; bool moveon; bool complain; + bool scrub_all = scrub_data > 1; int ip; int error; @@ -244,14 +245,15 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), } /* - * Complain if the checked block counts are off, which + * Complain if the data file verification block counts are off, which * implies an incomplete check. */ - if (ctx->bytes_checked && + if (scrub_data && (verbose || !within_range(ctx, used_data + used_rt, ctx->bytes_checked, absdiff, 1, 10, - _("verified blocks")))) { + scrub_all ? _("verified blocks") : + _("verified file data blocks")))) { double b1, b2; char *b1u, *b2u; @@ -262,8 +264,9 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), b1 = auto_space_units(used_data + used_rt, &b1u); b2 = auto_space_units(ctx->bytes_checked, &b2u); - fprintf(stdout, -_("%.1f%s data counted; %.1f%s data verified.\n"), + fprintf(stdout, scrub_all ? +_("%.1f%s data counted; %.1f%s disk media verified.\n") : +_("%.1f%s data counted; %.1f%s file data media verified.\n"), b1, b1u, b2, b2u); fflush(stdout); } diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index 46876522..89f6c96a 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -432,6 +432,8 @@ run_scrub_phases( /* Turn on certain phases if user said to. */ if (sp->fn == DATASCAN_DUMMY_FN && scrub_data) { sp->fn = xfs_scan_blocks; + if (scrub_data > 1) + sp->descr = _("Verify disk integrity."); } else if (sp->fn == REPAIR_DUMMY_FN && ctx->mode == SCRUB_MODE_REPAIR) { sp->descr = _("Repair filesystem."); ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] xfs_scrub: relabel verified data block counts in output 2019-09-06 3:40 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong @ 2019-09-12 23:42 ` Allison Collins 0 siblings, 0 replies; 10+ messages in thread From: Allison Collins @ 2019-09-12 23:42 UTC (permalink / raw) To: Darrick J. Wong, sandeen; +Cc: linux-xfs Ok, you can add my review: Reviewed-by: Allison Collins <allison.henderson@oracle.com> On 9/5/19 8:40 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Relabel the count of verified data blocks to make it more obvious that > we were only looking for file data. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > scrub/phase7.c | 13 ++++++++----- > scrub/xfs_scrub.c | 2 ++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > > diff --git a/scrub/phase7.c b/scrub/phase7.c > index 570ceb3f..2622bc45 100644 > --- a/scrub/phase7.c > +++ b/scrub/phase7.c > @@ -116,6 +116,7 @@ xfs_scan_summary( > unsigned long long f_free; > bool moveon; > bool complain; > + bool scrub_all = scrub_data > 1; > int ip; > int error; > > @@ -244,14 +245,15 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), > } > > /* > - * Complain if the checked block counts are off, which > + * Complain if the data file verification block counts are off, which > * implies an incomplete check. > */ > - if (ctx->bytes_checked && > + if (scrub_data && > (verbose || > !within_range(ctx, used_data + used_rt, > ctx->bytes_checked, absdiff, 1, 10, > - _("verified blocks")))) { > + scrub_all ? _("verified blocks") : > + _("verified file data blocks")))) { > double b1, b2; > char *b1u, *b2u; > > @@ -262,8 +264,9 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), > > b1 = auto_space_units(used_data + used_rt, &b1u); > b2 = auto_space_units(ctx->bytes_checked, &b2u); > - fprintf(stdout, > -_("%.1f%s data counted; %.1f%s data verified.\n"), > + fprintf(stdout, scrub_all ? > +_("%.1f%s data counted; %.1f%s disk media verified.\n") : > +_("%.1f%s data counted; %.1f%s file data media verified.\n"), > b1, b1u, b2, b2u); > fflush(stdout); > } > diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c > index 46876522..89f6c96a 100644 > --- a/scrub/xfs_scrub.c > +++ b/scrub/xfs_scrub.c > @@ -432,6 +432,8 @@ run_scrub_phases( > /* Turn on certain phases if user said to. */ > if (sp->fn == DATASCAN_DUMMY_FN && scrub_data) { > sp->fn = xfs_scan_blocks; > + if (scrub_data > 1) > + sp->descr = _("Verify disk integrity."); > } else if (sp->fn == REPAIR_DUMMY_FN && > ctx->mode == SCRUB_MODE_REPAIR) { > sp->descr = _("Repair filesystem."); > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/3] xfs_scrub: media scan entire disks @ 2019-08-26 21:32 Darrick J. Wong 2019-08-26 21:33 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 0 siblings, 1 reply; 10+ messages in thread From: Darrick J. Wong @ 2019-08-26 21:32 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs Hi all, Enable the administrator to request a full-disk media scan so that they can look for media problems in the free space, not just allocated file data. If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below. This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome. --D xfsprogs git tree: https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-scan-everything ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] xfs_scrub: relabel verified data block counts in output 2019-08-26 21:32 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong @ 2019-08-26 21:33 ` Darrick J. Wong 0 siblings, 0 replies; 10+ messages in thread From: Darrick J. Wong @ 2019-08-26 21:33 UTC (permalink / raw) To: sandeen, darrick.wong; +Cc: linux-xfs From: Darrick J. Wong <darrick.wong@oracle.com> Relabel the count of verified data blocks to make it more obvious that we were only looking for file data. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- scrub/phase7.c | 13 ++++++++----- scrub/xfs_scrub.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scrub/phase7.c b/scrub/phase7.c index 065a19dc..a7a1bdf5 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -116,6 +116,7 @@ xfs_scan_summary( unsigned long long f_free; bool moveon; bool complain; + bool scrub_all = scrub_data > 1; int ip; int error; @@ -244,14 +245,15 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), } /* - * Complain if the checked block counts are off, which + * Complain if the data file verification block counts are off, which * implies an incomplete check. */ - if (ctx->bytes_checked && + if (scrub_data && (verbose || !within_range(ctx, used_data + used_rt, ctx->bytes_checked, absdiff, 1, 10, - _("verified blocks")))) { + scrub_all ? _("verified blocks") : + _("verified file data blocks")))) { double b1, b2; char *b1u, *b2u; @@ -262,8 +264,9 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"), b1 = auto_space_units(used_data + used_rt, &b1u); b2 = auto_space_units(ctx->bytes_checked, &b2u); - fprintf(stdout, -_("%.1f%s data counted; %.1f%s data verified.\n"), + fprintf(stdout, scrub_all ? +_("%.1f%s data counted; %.1f%s disk media verified.\n") : +_("%.1f%s data counted; %.1f%s file data media verified.\n"), b1, b1u, b2, b2u); fflush(stdout); } diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index c4138807..3e7c1c64 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -432,6 +432,8 @@ run_scrub_phases( /* Turn on certain phases if user said to. */ if (sp->fn == DATASCAN_DUMMY_FN && scrub_data) { sp->fn = xfs_scan_blocks; + if (scrub_data > 1) + sp->descr = _("Verify disk integrity."); } else if (sp->fn == REPAIR_DUMMY_FN && ctx->mode == SCRUB_MODE_REPAIR) { sp->descr = _("Repair filesystem."); ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-11-06 20:22 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-22 18:49 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong 2019-10-22 18:50 ` [PATCH 1/3] xfs_scrub: implement background mode for phase 6 Darrick J. Wong 2019-10-22 18:50 ` [PATCH 2/3] xfs_scrub: perform media scans of entire devices Darrick J. Wong 2019-11-06 20:15 ` Eric Sandeen 2019-11-06 20:22 ` Darrick J. Wong 2019-10-22 18:50 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong -- strict thread matches above, loose matches on Subject: below -- 2019-09-25 21:37 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong 2019-09-25 21:38 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 2019-09-06 3:40 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong 2019-09-06 3:40 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong 2019-09-12 23:42 ` Allison Collins 2019-08-26 21:32 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong 2019-08-26 21:33 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).