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 status: Fix option string, adding -e and fixing order #16008

Merged
merged 1 commit into from
Mar 21, 2024

Conversation

cmharr
Copy link
Contributor

@cmharr cmharr commented Mar 18, 2024

Motivation and Context

Fixes missing zpool status help option and alphabetizes the options

Issue #16004

Description

The recently added '-e' option (PR #15769) missed adding the new option in the online zpool status help command. This adds the option and reorders the 'i' and 'D' options alphabetically.

How Has This Been Tested?

Test new online help menu:
Before:

[root@iron5:zfs2.2]# ./zpool status -h
invalid option 'h'
usage:
	status [--power] [-c [script1,script2,...]] [-igLpPstvxD]  [-T d|u] [pool] ... 
	    [interval [count]]

After:

[root@iron5:zfs2.2]# ./zpool status -h
invalid option 'h'
usage:
	status [--power] [-c [script1,script2,...]] [-DegiLpPstvx]  [-T d|u] [pool] ... 
	    [interval [count]]

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)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • 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.
  • [] I have run the ZFS Test Suite with this change applied.
  • All commit messages are properly formatted and contain Signed-off-by.

Signed-off-by: Cameron Harr harr1@llnl.gov

@cmharr cmharr force-pushed the zpool_status_docfix branch from 4890cb8 to 86d5832 Compare March 18, 2024 23:40
Copy link
Contributor

@bwatkinson bwatkinson left a comment

Choose a reason for hiding this comment

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

Just a little bit of OCD on my part, but can you also update zpool-status.8 to also have the options list in alphabetical order as well as part of the PR? They are in line 39 of that file.

@cmharr cmharr force-pushed the zpool_status_docfix branch from 86d5832 to 1f76b51 Compare March 19, 2024 00:15
@cmharr
Copy link
Contributor Author

cmharr commented Mar 19, 2024

@bwatkinson, I think I got all the places in zpool status with the wrong order. Thanks for pointing out where it still needed an edit.

@bwatkinson
Copy link
Contributor

@bwatkinson, I think I got all the places in zpool status with the wrong order. Thanks for pointing out where it still needed an edit.

Cool and thanks. Also can you look into the CI test failures for:

    FAIL cli_root/zpool_status/zpool_status_001_pos (expected PASS)
    FAIL cli_root/zpool_status/zpool_status_002_pos (expected PASS)
    FAIL cli_user/misc/zpool_001_neg (expected PASS)

Those seem to reliably fail with this PR.

@cmharr cmharr force-pushed the zpool_status_docfix branch from 1f76b51 to d3b4ea1 Compare March 20, 2024 00:13
The recently added '-e' option (PR openzfs#15769) missed adding the
new option in the online `zpool status` help command. This
adds the options and reorders a couple of the other options
that were not listed alphabetically.

Signed-off-by: Cameron Harr <harr1@llnl.gov>
@cmharr cmharr force-pushed the zpool_status_docfix branch from d3b4ea1 to 76eaf37 Compare March 20, 2024 15:12
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Mar 20, 2024
@behlendorf behlendorf merged commit c9d8f6c into openzfs:master Mar 21, 2024
23 of 26 checks passed
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Mar 21, 2024
tonyhutter pushed a commit that referenced this pull request May 2, 2024
The recently added '-e' option (PR #15769) missed adding the
new option in the online `zpool status` help command. This
adds the options and reorders a couple of the other options
that were not listed alphabetically.

Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Cameron Harr <harr1@llnl.gov>
Closes #16008
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 4, 2024
The recently added '-e' option (PR openzfs#15769) missed adding the
new option in the online `zpool status` help command. This
adds the options and reorders a couple of the other options
that were not listed alphabetically.

Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Cameron Harr <harr1@llnl.gov>
Closes openzfs#16008
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.

3 participants