fix typesetting of Errata #4

[JMoVS]

fixes #8712

Signed-off-by: Justin Scholz git@justinscholz.de

Added some missing tabs and newlines, was not able to verify myself though that it fixes the problem. Could someone with access to a linux verify before merging? For both the import and the status callback?

Motivation and Context

Description

Tried to catch all tabs and new lines that were still missing

How Has This Been Tested?

Wasn't able to test, please verify it before merging.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Performance enhancement (non-breaking change which improves efficiency)
• Code cleanup (non-breaking change which makes code smaller or more readable)
• Breaking change (fix or feature that would cause existing functionality to change)
• Documentation (a change to man pages or other documentation)

Checklist:

• My code follows the ZFS on Linux code style requirements.
• I have updated the documentation accordingly.
• I have read the contributing document.
• I have added tests to cover my changes.
• All new and existing tests passed.
• All commit messages are properly formatted and contain Signed-off-by.

[behlendorf]

@JMoVS after locally testing the formatting of this PR I spotted a couple of lines which slightly exceeded the 80 character limit. While I had a test system set up I took the liberty of updating the formatting, the resulting output looks like this:

$ zpool import
   pool: tank
     id: 13002386651819330324
  state: ONLINE
 status: Errata #4 detected.
 action: Existing encrypted snapshots and bookmarks contain an on-disk
        incompatibility. This may cause on-disk corruption if they are used
        with 'zfs recv'. To correct the issue, enable the bookmark_v2 feature.
        No additional action is needed if there are no encrypted snapshots or
        bookmarks. If preserving the encrypted snapshots and bookmarks is
        required, use a non-raw send to backup and restore them. Alternately,
        they may be removed to resolve the incompatibility.
   see: http://zfsonlinux.org/msg/ZFS-8000-ER
 config:

        tank        ONLINE
          vdc       ONLINE

$ zpool import tank
$ zpool status
  pool: tank
 state: ONLINE
status: Errata #4 detected.
        Existing encrypted snapshots and bookmarks contain an on-disk
        incompatibility. This may cause on-disk corruption if they are used
        with 'zfs recv'.
action: To correct the issue, enable the bookmark_v2 feature. No additional
        action is needed if there are no encrypted snapshots or bookmarks.
        If preserving the encrypted snapshots and bookmarks is required, use
        a non-raw send to backup and restore them. Alternately, they may be
        removed to resolve the incompatibility.
   see: http://zfsonlinux.org/msg/ZFS-8000-ER
  scan: none requested
config:

        NAME        STATE     READ WRITE CKSUM
        tank        ONLINE       0     0     0
          vdc       ONLINE       0     0     0

errors: No known data errors

Would you mind updating this PR using behlendorf/zfs@b509b15. Or, if you prefer, I can open a replacement PR. Thanks.

[JMoVS]

@behlendorf I can update, but in your output in the first case, there are 7 spaces in the 7 lines after the first missing at the beginning including in the "see" line.

[JMoVS]

@behlendorf Thanks for testing and the fix! I pulled your branch and force-pushed, so this PR should be updated properly now.

[codecov]

Codecov Report

Merging #8721 into master will increase coverage by 0.1%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##           master    #8721     +/-   ##
=========================================
+ Coverage   78.73%   78.83%   +0.1%     
=========================================
  Files         381      381             
  Lines      117674   117630     -44     
=========================================
+ Hits        92649    92734     +85     
+ Misses      25025    24896    -129

Flag	Coverage Δ
#kernel	79.26% <ø> (-0.05%)	⬇️
#user	67.75% <100%> (+0.51%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1f02ecc...b509b15. Read the comment docs.

[rlaager]

@JMoVS I'm confused about the status of this. To me, the first output from @behlendorf does not line up.

[JMoVS]

@rlaager I've briefly chatted with @behlendorf about it today in the morning, here's from IRC:

00:36 <+behlendorf> JMoVS I'm pretty sure that must be a cut and paste error since the patch uses tabs there. Sorry about that.

[behlendorf]

To me, the first output from @behlendorf does not line up.

The alignment of the zpool import output is unfortunately expected. The left 'column' of this output has been one character wider than the zpool status output (9 vs 8) for a while now, and all of the 'action' messages are indented with a single tab.

Offhand I'm not sure why this is the case, and I agree making the alignment consistent is the right thing to do. But I think addressing that is outside the scope of this PR, and it really warrants its own.

@rlaager assuming you agree could you review and approve this PR.

[ofaaland]

LGTM

[rlaager]

This LGTM, subject to the caveat that I didn't run this and only reviewed the output as pasted here.