c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clearer wording on Errata #4

Browse Source 
Users of existing pools, especially pools with top-level encrypted 
datasets, could run into trouble trying to work around Errata #4. 
Clarify that removing encrypted snapshots and bookmarks is enough
to clear the errata.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tom Caputi <tcaputi@datto.com>
Signed-off-by: Justin Scholz <git@justinscholz.de>
Closes #8682 
Closes #8683
This commit is contained in:
JMoVS 2019-05-03 01:52:57 +02:00 committed by Brian Behlendorf
parent 8d9f616511
commit b3b60984ee
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/zpool/zpool_main.c
View File

@ -2567,17 +2567,19 @@ show_import(nvlist_t *config)
break;
case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
(void) printf(gettext(" action: Any existing "
"encrypted datasets contain an on-disk "
"incompatibility\n\twhich may cause "
"on-disk corruption with 'zfs recv' and "
"which needs\n\tto be corrected. Enable "
"the bookmark_v2 feature, backup "
"these datasets\n\tto new encrypted "
"datasets, and destroy the old ones. "
"If this pool does\n\tnot contain any "
"encrypted datasets, simply enable the "
"bookmark_v2\n\tfeature.\n"));
(void) printf(gettext(" action: Existing "
"encrypted snapshots and bookmarks contain "
"an on-disk\n\tincompatibility. This may "
"cause on-disk corruption if they are used "
"with\n\t'zfs recv'. To correct the issue, "
"enable the bookmark_v2 feature. No "
"additional\n\taction is needed if there "
"are no encrypted snapshots or bookmarks. "
"If preserving\n\tthe encrypted snapshots "
"and bookmarks is required, use a non-raw "
"send to backup\n\tand restore them. "
"Alternately, they may be removed to "
"resolve the\n\tincompatibility.\n"));
break;
default:
/*
@ -7634,16 +7636,19 @@ status_callback(zpool_handle_t *zhp, void *data)
break;
case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
(void) printf(gettext("\tExisting encrypted datasets "
"contain an on-disk incompatibility\n\twhich "
"needs to be corrected.\n"));
(void) printf(gettext("action: To correct the issue "
"enable the bookmark_v2 feature, backup\n\tany "
"existing encrypted datasets to new encrypted "
"datasets,\n\tand destroy the old ones. If this "
"pool does not contain any\n\tencrypted "
"datasets, simply enable the bookmark_v2 "
"feature.\n"));
(void) printf(gettext("Existing encrypted snapshots "
"and bookmarks contain an on-disk "
"incompatibility.\n\tThis may cause on-disk "
"corruption if they are used with 'zfs recv'."));
(void) printf(gettext(" action: To correct the issue, "
"enable the bookmark_v2 feature. No "
"additional\n\taction is needed if there "
"are no encrypted snapshots or bookmarks. "
"If preserving\n\tthe encrypted snapshots "
"and bookmarks is required, use a non-raw "
"send to backup\n\tand restore them. "
"Alternately, they may be removed to "
"resolve the\n\tincompatibility.\n"));
break;
default: