d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always continue recursive destroy after error

Browse Source 
Currently, during a recursive zfs destroy the first error that is
encountered will stop the destruction of the datasets. Errors may
happen for a variety of reasons including competing deletions
and busy datasets.
This patch switches recursive destroy to always do a best-effort
recursive dataset destroy.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Alek Pinchuk <apinchuk@datto.com>
Closes #7574
This commit is contained in:
Alek P 2018-06-06 13:14:52 -04:00 committed by Brian Behlendorf
parent 62841115bc
commit 6969afcefd
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/zfs/zfs_main.c
View File

@ -1189,6 +1189,15 @@ destroy_callback(zfs_handle_t *zhp, void *data)
zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 || zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 ||
zfs_destroy(zhp, cb->cb_defer_destroy) != 0) { zfs_destroy(zhp, cb->cb_defer_destroy) != 0) {
zfs_close(zhp); zfs_close(zhp);
/*
* When performing a recursive destroy we ignore errors
* so that the recursive destroy could continue
* destroying past problem datasets
*/
if (cb->cb_recurse) {
cb->cb_error = B_TRUE;
return (0);
}
return (-1); return (-1);
} }
} }
@ -1558,7 +1567,7 @@ zfs_do_destroy(int argc, char **argv)
err = zfs_destroy_snaps_nvl(g_zfs, err = zfs_destroy_snaps_nvl(g_zfs,
cb.cb_batchedsnaps, cb.cb_defer_destroy); cb.cb_batchedsnaps, cb.cb_defer_destroy);
} }
if (err != 0) if (err != 0 || cb.cb_error == B_TRUE)
rv = 1; rv = 1;
} }

30
tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
# Copyright (c) 2018 Datto Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
@ -106,24 +107,11 @@ log_note "mkbusy $mntpt/$TESTFILE0 (pidlist: $pidlist)"
[[ -z $pidlist ]] && log_fail "Failure from mkbusy" [[ -z $pidlist ]] && log_fail "Failure from mkbusy"
negative_test "-R -rR" $CTR negative_test "-R -rR" $CTR
# # The following busy datasets will still exist
# Checking the outcome of the test above is tricky, because the order in
# which datasets are destroyed is not deterministic. Both $FS and $VOL are
# busy, and the remaining datasets will be different depending on whether we
# tried (and failed) to delete $FS or $VOL first.
# The following datasets will exist independent of the order
check_dataset datasetexists $CTR $FS $VOL check_dataset datasetexists $CTR $FS $VOL
if datasetexists $VOLSNAP && datasetnonexists $FSSNAP; then # The following datasets will not exist because of best-effort recursive destroy
# The recursive destroy failed on $FS if datasetexists $VOLSNAP || datasetexists $FSSNAP; then
check_dataset datasetnonexists $FSSNAP $FSCLONE
check_dataset datasetexists $VOLSNAP $VOLCLONE
elif datasetexists $FSSNAP && datasetnonexists $VOLSNAP; then
# The recursive destroy failed on $VOL
check_dataset datasetnonexists $VOLSNAP $VOLCLONE
check_dataset datasetexists $FSSNAP $FSCLONE
else
log_must zfs list -rtall log_must zfs list -rtall
log_fail "Unexpected datasets remaining" log_fail "Unexpected datasets remaining"
fi fi
@ -157,15 +145,9 @@ if is_global_zone; then
check_dataset datasetexists $CTR $VOL check_dataset datasetexists $CTR $VOL
check_dataset datasetnonexists $VOLSNAP $VOLCLONE check_dataset datasetnonexists $VOLSNAP $VOLCLONE
# Here again, the non-determinism of destroy order is a factor. $FS, # Due to recusive destroy being a best-effort operation,
# $FSSNAP and $FSCLONE will still exist here iff we attempted to destroy # all of the non-busy datasets bellow should be gone now.
# $VOL (and failed) first. So check that either all of the datasets are
# present, or they're all gone.
if datasetexists $FS; then
check_dataset datasetexists $FS $FSSNAP $FSCLONE
else
check_dataset datasetnonexists $FS $FSSNAP $FSCLONE check_dataset datasetnonexists $FS $FSSNAP $FSCLONE
fi
fi fi
# #