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.

Sign up for GitHub

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

Jump to bottom

Fix zpool subcommands error message with some unsupported options #9270

Merged
merged 1 commit into from
Sep 4, 2019
Merged

Fix zpool subcommands error message with some unsupported options #9270

merged 1 commit into from
Sep 4, 2019

Conversation

loli10K
Copy link
Contributor

@loli10K loli10K commented Sep 1, 2019

Motivation and Context

Both 'detach' and 'online' zpool subcommands, when provided with an unsupported option, forget to print it in the error message:

root@linux:/usr/src/zfs# ./cmd/zpool/zpool online -t rpool vda3
invalid option ''
usage:
	online [-e] <pool> <device> ...
root@linux:/usr/src/zfs#

Description

This changes fixes the error message in order to include the actual option that is not supported.

How Has This Been Tested?

Tested on local Debian10 builder, without patch:

root@linux:/usr/src/zfs# ./cmd/zpool/zpool online -t rpool vda3
invalid option ''
usage:
	online [-e] <pool> <device> ...

with patch applied:

root@linux:/usr/src/zfs# zpool online -t rpool vda3
invalid option 't'
usage:
	online [-e] <pool> <device> ...

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:

@loli10K
Fix zpool subcommands error message with some unsupported options
416808c 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
@loli10K loli10K added the Status: Code Review Needed Ready for review and testing label Sep 1, 2019
@codecov
Copy link

codecov bot commented Sep 1, 2019 •
edited
Loading

Codecov Report

Merging #9270 into master will decrease coverage by 0.24%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9270      +/-   ##
==========================================
- Coverage   79.31%   79.07%   -0.25%     
==========================================
  Files         400      400              
  Lines      122034   122035       +1     
==========================================
- Hits        96792    96497     -295     
- Misses      25242    25538     +296
Flag Coverage Δ
#kernel 79.75% <ø> (-0.07%) ⬇️
#user 66.55% <100%> (-0.91%) ⬇️

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 c953960...416808c. Read the comment docs.

ghost
ghost approved these changes Sep 4, 2019
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Looks good. Those unused flags appear to have been vestigial from before the initial import for both ZoL and FreeBSD.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 4, 2019
@behlendorf behlendorf merged commit d02186e into openzfs:master Sep 4, 2019
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 17, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
32a0ca5 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes openzfs#9270
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
5aebd48 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes openzfs#9270
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
b74f978 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes openzfs#9270
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
36d0f5a 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes openzfs#9270
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 19, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
8718b2b 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes openzfs#9270
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 23, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
b5ea744 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes openzfs#9270
tonyhutter pushed a commit that referenced this pull request Sep 26, 2019
@loli10K @tonyhutter
Fix zpool subcommands error message with some unsupported options
146d7d8 
Both 'detach' and 'online' zpool subcommands, when provided with an
unsupported option, forget to print it in the error message:

   # zpool online -t rpool vda3
   invalid option ''
   usage:
      online [-e] <pool> <device> ...

This changes fixes the error message in order to include the actual
option that is not supported.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #9270
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@loli10K @behlendorf