Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Add more control/visibility to spa_load_verify(). 

Use error thresholds from policy to control whether to scrub data
and/or metadata.  If threshold is set to UINT64_MAX, then caller
probably does not care about result and we may skip that part.

By default import neither set the data error threshold nor read
the error counter, so skip the data scrub for faster import.
Metadata are still scrubbed and fail if even single error found.

While there just for symmetry return number of metadata errors in
case threshold is not set to zero and we haven't reached it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Pavel Zakharov <pavel.zakharov@delphix.com>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Closes #13022
This commit is contained in:
Alexander Motin 2022-02-04 16:06:38 -05:00 committed by Brian Behlendorf
parent 72a4709a59
commit fdb80a2301
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/fs/zfs.h
View File

@ -757,6 +757,7 @@ typedef struct zpool_load_policy {
/* Rewind data discovered */ /* Rewind data discovered */
#define ZPOOL_CONFIG_LOAD_TIME "rewind_txg_ts" #define ZPOOL_CONFIG_LOAD_TIME "rewind_txg_ts"
#define ZPOOL_CONFIG_LOAD_META_ERRORS "verify_meta_errors"
#define ZPOOL_CONFIG_LOAD_DATA_ERRORS "verify_data_errors" #define ZPOOL_CONFIG_LOAD_DATA_ERRORS "verify_data_errors"
#define ZPOOL_CONFIG_REWIND_TIME "seconds_of_rewind" #define ZPOOL_CONFIG_REWIND_TIME "seconds_of_rewind"

20
module/zfs/spa.c
View File

@ -2256,6 +2256,7 @@ spa_claim_notify(zio_t *zio)
} }
typedef struct spa_load_error { typedef struct spa_load_error {
boolean_t sle_verify_data;
uint64_t sle_meta_count; uint64_t sle_meta_count;
uint64_t sle_data_count; uint64_t sle_data_count;
} spa_load_error_t; } spa_load_error_t;
@ -2296,6 +2297,9 @@ static int
spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg) const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
{ {
zio_t *rio = arg;
spa_load_error_t *sle = rio->io_private;
(void) zilog, (void) dnp; (void) zilog, (void) dnp;
if (zb->zb_level == ZB_DNODE_LEVEL || BP_IS_HOLE(bp) || if (zb->zb_level == ZB_DNODE_LEVEL || BP_IS_HOLE(bp) ||
@ -2308,12 +2312,12 @@ spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
*/ */
if (!spa_load_verify_metadata) if (!spa_load_verify_metadata)
return (0); return (0);
if (!BP_IS_METADATA(bp) && !spa_load_verify_data) if (!BP_IS_METADATA(bp) &&
(!spa_load_verify_data || !sle->sle_verify_data))
return (0); return (0);
uint64_t maxinflight_bytes = uint64_t maxinflight_bytes =
arc_target_bytes() >> spa_load_verify_shift; arc_target_bytes() >> spa_load_verify_shift;
zio_t *rio = arg;
size_t size = BP_GET_PSIZE(bp); size_t size = BP_GET_PSIZE(bp);
mutex_enter(&spa->spa_scrub_lock); mutex_enter(&spa->spa_scrub_lock);
@ -2351,7 +2355,8 @@ spa_load_verify(spa_t *spa)
zpool_get_load_policy(spa->spa_config, &policy); zpool_get_load_policy(spa->spa_config, &policy);
if (policy.zlp_rewind & ZPOOL_NEVER_REWIND) if (policy.zlp_rewind & ZPOOL_NEVER_REWIND ||
policy.zlp_maxmeta == UINT64_MAX)
return (0); return (0);
dsl_pool_config_enter(spa->spa_dsl_pool, FTAG); dsl_pool_config_enter(spa->spa_dsl_pool, FTAG);
@ -2362,6 +2367,13 @@ spa_load_verify(spa_t *spa)
if (error != 0) if (error != 0)
return (error); return (error);
/*
* Verify data only if we are rewinding or error limit was set.
* Otherwise nothing except dbgmsg care about it to waste time.
*/
sle.sle_verify_data = (policy.zlp_rewind & ZPOOL_REWIND_MASK) ||
(policy.zlp_maxdata < UINT64_MAX);
rio = zio_root(spa, NULL, &sle, rio = zio_root(spa, NULL, &sle,
ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE); ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE);
@ -2405,6 +2417,8 @@ spa_load_verify(spa_t *spa)
spa->spa_load_txg_ts); spa->spa_load_txg_ts);
fnvlist_add_int64(spa->spa_load_info, ZPOOL_CONFIG_REWIND_TIME, fnvlist_add_int64(spa->spa_load_info, ZPOOL_CONFIG_REWIND_TIME,
loss); loss);
fnvlist_add_uint64(spa->spa_load_info,
ZPOOL_CONFIG_LOAD_META_ERRORS, sle.sle_meta_count);
fnvlist_add_uint64(spa->spa_load_info, fnvlist_add_uint64(spa->spa_load_info,
ZPOOL_CONFIG_LOAD_DATA_ERRORS, sle.sle_data_count); ZPOOL_CONFIG_LOAD_DATA_ERRORS, sle.sle_data_count);
} else { } else {