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