Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zpool: correctly align columns with -p, also manpage typo #11202

Closed

Conversation

nabijaczleweli
Copy link
Contributor

Motivation and Context

This sucks:

nabijaczleweli@babtop:~/code/zfs/cmd/zpool$ ./zpool list -p
NAME      SIZE  ALLOC   FREE  CKPOINT  EXPANDSZ   FRAG    CAP  DEDUP    HEALTH  ALTROOT
babzoot  489626271744  12491923456  477134348288        -         -      0      2   1.00    ONLINE  -
nabijaczleweli@babtop:~/code/zfs/cmd/zpool$ ./zpool list
NAME      SIZE  ALLOC   FREE  CKPOINT  EXPANDSZ   FRAG    CAP  DEDUP    HEALTH  ALTROOT
babzoot   456G  11.6G   444G        -         -     0%     2%  1.00x    ONLINE  -
nabijaczleweli@babtop:~/code/zfs/cmd/zpool$ git log -1
commit 3fcd737478217ab3f4cc518fadb20e1931f13dfe (HEAD -> master, origin/master, origin/HEAD)

This doesn't:

nabijaczleweli@babtop:~/code/zfs/cmd/zpool$ ./zpool list -p
NAME             SIZE        ALLOC          FREE  CKPOINT  EXPANDSZ   FRAG    CAP  DEDUP    HEALTH  ALTROOT
babzoot  489626271744  12544172032  477082099712        -         -      0      2   1.00    ONLINE  -
nabijaczleweli@babtop:~/code/zfs/cmd/zpool$ ./zpool list
NAME      SIZE  ALLOC   FREE  CKPOINT  EXPANDSZ   FRAG    CAP  DEDUP    HEALTH  ALTROOT
babzoot   456G  11.7G   444G        -         -     0%     2%  1.00x    ONLINE  -
nabijaczleweli@babtop:~/code/zfs/cmd/zpool$ git log -1
commit 299b4e2db5f38ce8892647590ac5393d99ef1b88 (HEAD -> whats-an-alignment, nab/whats-an-alignment)

Description

zpool_expand_proplist() now ignores pl_fixed if its new literal argument is true.
The rest is collateral damage to pass that down. This also, sadly, affects libzfs, but it's not like there's any guarantees on that.

Also there's a typo in the manpage.

How Has This Been Tested?

I ran zpool list, zpool get, and zpool iostat with -p and they were usable.

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 OpenZFS code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes. ‒ N/A
  • I have run the ZFS Test Suite with this change applied. ‒ I dunno how to, nor did I change any core funxionality
  • All commit messages are properly formatted and contain Signed-off-by.

Sorry, something went wrong.

@nabijaczleweli nabijaczleweli changed the title zpool: correctly align columns with -p' also manpage typo zpool: correctly align columns with -p, also manpage typo Nov 13, 2020
@nabijaczleweli nabijaczleweli force-pushed the whats-an-alignment branch 2 times, most recently from 98195ab to 90163fb Compare November 13, 2020 23:46
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Nov 14, 2020
@nabijaczleweli
Copy link
Contributor Author

nabijaczleweli commented Nov 14, 2020

Dunno why tests are failing on some platforms; AFAICT from the few I've checked, these don't go anywhere close my code and they pass on other buildds.

Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. The CI failures were unrelated.

cmd/zpool/zpool_iter.c Outdated Show resolved Hide resolved
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Nov 16, 2020
behlendorf pushed a commit that referenced this pull request Nov 16, 2020
zpool_expand_proplist() now ignores pl_fixed if its new literal
argument is true.  The rest is a consequence of needing to pass
that down.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiao?=~Dska <[email protected]>
Closes #11202
behlendorf pushed a commit that referenced this pull request Nov 17, 2020
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #11202
behlendorf pushed a commit that referenced this pull request Nov 17, 2020
zpool_expand_proplist() now ignores pl_fixed if its new literal
argument is true.  The rest is a consequence of needing to pass
that down.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiao?=~Dska <[email protected]>
Closes #11202
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11202
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
zpool_expand_proplist() now ignores pl_fixed if its new literal
argument is true.  The rest is a consequence of needing to pass
that down.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiao?=~Dska <[email protected]>
Closes openzfs#11202
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11202
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
zpool_expand_proplist() now ignores pl_fixed if its new literal
argument is true.  The rest is a consequence of needing to pass
that down.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiao?=~Dska <[email protected]>
Closes openzfs#11202
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants