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

Rework error handling in zpool_trim() 

When a manual trim is run against an entire pool, errors about
particular devices which don't support trim are suppressed. This changes
zpool_trim() in libzfs so that it doesn't return an error when the only
errors are suppressed ones. An exception is made when none of the
devices support trim, in which case an error is reported and a non-zero
status is returned.

This also fixes how the --wait flag works in the presence of suppressed
errors. In particular, suppressed errors no longer cause zpool_trim()
to skip the wait.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: John Gallagher <john.gallagher@delphix.com>
Closes #10263 
Closes #10372
This commit is contained in:
John Gallagher 2020-05-27 17:27:28 -07:00 committed by GitHub
parent 40f96f4643
commit 50ff632787
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
lib/libzfs/libzfs_pool.c
View File

@ -2277,49 +2277,25 @@ zpool_trim_wait(zpool_handle_t *zhp, nvlist_t *vdev_guids)
} }
/* /*
* Begin, suspend, or cancel the TRIM (discarding of all free blocks) for * Check errlist and report any errors, omitting ones which should be
* the given vdevs in the given pool. * suppressed. Returns B_TRUE if any errors were reported.
*/ */
int static boolean_t
zpool_trim(zpool_handle_t *zhp, pool_trim_func_t cmd_type, nvlist_t *vds, check_trim_errs(zpool_handle_t *zhp, trimflags_t *trim_flags,
trimflags_t *trim_flags) nvlist_t *guids_to_paths, nvlist_t *vds, nvlist_t *errlist)
{ {
char msg[1024];
int err;
nvlist_t *vdev_guids = fnvlist_alloc();
nvlist_t *guids_to_paths = fnvlist_alloc();
nvlist_t *vd_errlist = NULL;
nvlist_t *errlist;
nvpair_t *elem; nvpair_t *elem;
boolean_t reported_errs = B_FALSE;
int num_vds = 0;
int num_suppressed_errs = 0;
err = zpool_translate_vdev_guids(zhp, vds, vdev_guids, for (elem = nvlist_next_nvpair(vds, NULL);
guids_to_paths, &vd_errlist); elem != NULL; elem = nvlist_next_nvpair(vds, elem)) {
if (err == 0) { num_vds++;
err = lzc_trim(zhp->zpool_name, cmd_type, trim_flags->rate,
trim_flags->secure, vdev_guids, &errlist);
if (err == 0) {
if (trim_flags->wait)
err = zpool_trim_wait(zhp, vdev_guids);
fnvlist_free(vdev_guids);
fnvlist_free(guids_to_paths);
return (err);
}
if (errlist != NULL) {
vd_errlist = fnvlist_lookup_nvlist(errlist,
ZPOOL_TRIM_VDEVS);
}
(void) snprintf(msg, sizeof (msg),
dgettext(TEXT_DOMAIN, "operation failed"));
} else {
verify(vd_errlist != NULL);
} }
for (elem = nvlist_next_nvpair(vd_errlist, NULL); for (elem = nvlist_next_nvpair(errlist, NULL);
elem != NULL; elem = nvlist_next_nvpair(vd_errlist, elem)) { elem != NULL; elem = nvlist_next_nvpair(errlist, elem)) {
int64_t vd_error = xlate_trim_err(fnvpair_value_int64(elem)); int64_t vd_error = xlate_trim_err(fnvpair_value_int64(elem));
char *path; char *path;
@ -2331,9 +2307,11 @@ zpool_trim(zpool_handle_t *zhp, pool_trim_func_t cmd_type, nvlist_t *vds,
if (vd_error == EZFS_TRIM_NOTSUP && if (vd_error == EZFS_TRIM_NOTSUP &&
trim_flags->fullpool && trim_flags->fullpool &&
!trim_flags->secure) { !trim_flags->secure) {
num_suppressed_errs++;
continue; continue;
} }
reported_errs = B_TRUE;
if (nvlist_lookup_string(guids_to_paths, nvpair_name(elem), if (nvlist_lookup_string(guids_to_paths, nvpair_name(elem),
&path) != 0) &path) != 0)
path = nvpair_name(elem); path = nvpair_name(elem);
@ -2342,15 +2320,72 @@ zpool_trim(zpool_handle_t *zhp, pool_trim_func_t cmd_type, nvlist_t *vds,
"cannot trim '%s'", path); "cannot trim '%s'", path);
} }
fnvlist_free(vdev_guids); if (num_suppressed_errs == num_vds) {
fnvlist_free(guids_to_paths); (void) zfs_error_aux(zhp->zpool_hdl, dgettext(TEXT_DOMAIN,
"no devices in pool support trim operations"));
if (vd_errlist != NULL) { (void) (zfs_error(zhp->zpool_hdl, EZFS_TRIM_NOTSUP,
fnvlist_free(vd_errlist); dgettext(TEXT_DOMAIN, "cannot trim")));
return (-1); reported_errs = B_TRUE;
} }
return (zpool_standard_error(zhp->zpool_hdl, err, msg)); return (reported_errs);
}
/*
* Begin, suspend, or cancel the TRIM (discarding of all free blocks) for
* the given vdevs in the given pool.
*/
int
zpool_trim(zpool_handle_t *zhp, pool_trim_func_t cmd_type, nvlist_t *vds,
trimflags_t *trim_flags)
{
int err;
int retval = 0;
nvlist_t *vdev_guids = fnvlist_alloc();
nvlist_t *guids_to_paths = fnvlist_alloc();
nvlist_t *errlist = NULL;
err = zpool_translate_vdev_guids(zhp, vds, vdev_guids,
guids_to_paths, &errlist);
if (err != 0) {
check_trim_errs(zhp, trim_flags, guids_to_paths, vds, errlist);
retval = -1;
goto out;
}
err = lzc_trim(zhp->zpool_name, cmd_type, trim_flags->rate,
trim_flags->secure, vdev_guids, &errlist);
if (err != 0) {
nvlist_t *vd_errlist;
if (errlist != NULL && nvlist_lookup_nvlist(errlist,
ZPOOL_TRIM_VDEVS, &vd_errlist) == 0) {
if (check_trim_errs(zhp, trim_flags, guids_to_paths,
vds, vd_errlist)) {
retval = -1;
goto out;
}
} else {
char msg[1024];
(void) snprintf(msg, sizeof (msg),
dgettext(TEXT_DOMAIN, "operation failed"));
zpool_standard_error(zhp->zpool_hdl, err, msg);
retval = -1;
goto out;
}
}
if (trim_flags->wait)
retval = zpool_trim_wait(zhp, vdev_guids);
out:
if (errlist != NULL)
fnvlist_free(errlist);
fnvlist_free(vdev_guids);
fnvlist_free(guids_to_paths);
return (retval);
} }
/* /*