diff options
| author | Tom Caputi <[email protected]> | 2019-03-14 19:48:30 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-03-14 16:48:30 -0700 |
| commit | eaed840542b49b36fb8ed3a2aaf7208629974434 (patch) | |
| tree | 63091c068eeda538d1e4dfefe8b907ce19547455 /cmd/zpool/zpool_main.c | |
| parent | 98310e5d1aebda5a7cd986c8a0dc9932d62ead56 (diff) | |
Better user experience for errata 4
This patch attempts to address some user concerns that have arisen
since errata 4 was introduced.
* The errata warning has been made less scary for users without
any encrypted datasets.
* The errata warning now clears itself without a pool reimport if
the bookmark_v2 feature is enabled and no encrypted datasets
exist.
* It is no longer possible to create new encrypted datasets without
enabling the bookmark_v2 feature, thus helping to ensure that the
errata is resolved.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Issue ##8308
Closes #8504
Diffstat (limited to 'cmd/zpool/zpool_main.c')
| -rw-r--r-- | cmd/zpool/zpool_main.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index c36003c98..61403a173 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -2479,15 +2479,17 @@ show_import(nvlist_t *config) break; case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION: - (void) printf(gettext(" action: Existing " + (void) printf(gettext(" action: Any existing " "encrypted datasets contain an on-disk " - "incompatibility which\n\tmay cause " + "incompatibility\n\twhich may cause " "on-disk corruption with 'zfs recv' and " - "which needs to be\n\tcorrected. Enable " - "the bookmark_v2 feature and backup " - "these datasets to new encrypted " - "datasets and\n\tdestroy the " - "old ones.\n")); + "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")); break; default: /* @@ -7417,10 +7419,12 @@ status_callback(zpool_handle_t *zhp, void *data) "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 and " - "backup\n\texisting encrypted datasets to new " - "encrypted datasets and\n\tdestroy the old " - "ones.\n")); + "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")); break; default: |