-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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/zfs: allow --json
wherever -j
is allowed
#16632
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
robn
force-pushed
the
zpool-zfs-json-long-opt
branch
from
October 10, 2024 00:46
fd42b3d
to
0cfe925
Compare
usaleem-ix
approved these changes
Oct 10, 2024
behlendorf
approved these changes
Oct 10, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, let's just add some usage of the long option to json/json_sanity.ksh
.
tonyhutter
approved these changes
Oct 10, 2024
behlendorf
added
Status: Accepted
Ready to integrate (reviewed, tested)
and removed
Status: Code Review Needed
Ready for review and testing
labels
Oct 10, 2024
Mostly so that with the JSON formatting options are also used, they all look the same. To my eye, `-j --json-flat-vdevs` suggests that they are different or unrelated, while `--json --json-flat-vdevs` invites no further questions. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
robn
force-pushed
the
zpool-zfs-json-long-opt
branch
from
October 10, 2024 21:35
0cfe925
to
0b68787
Compare
Oh neat, I missed that test. Updated, thanks! |
behlendorf
pushed a commit
to behlendorf/zfs
that referenced
this pull request
Oct 11, 2024
Mostly so that with the JSON formatting options are also used, they all look the same. To my eye, `-j --json-flat-vdevs` suggests that they are different or unrelated, while `--json --json-flat-vdevs` invites no further questions. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Umer Saleem <usaleem@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes openzfs#16632
ixhamza
pushed a commit
to truenas/zfs
that referenced
this pull request
Nov 11, 2024
Mostly so that with the JSON formatting options are also used, they all look the same. To my eye, `-j --json-flat-vdevs` suggests that they are different or unrelated, while `--json --json-flat-vdevs` invites no further questions. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Umer Saleem <usaleem@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes openzfs#16632
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[Sponsors: Klara, Inc., Wasabi Technology, Inc.]
Motivation and Context
Mostly so that with the JSON formatting options are also used, they all look the same. To my eye,
-j --json-flat-vdevs
suggests that they are different or unrelated, while--json --json-flat-vdevs
invites no further questions.Description
Anywhere
-j
is accepted, also allow--json
. For a couple of things, this means changing togetopt_long()
, but its no big deal.I have left the usage doc using
-j
, and added--json
to the flag descriptions in the manpages only. This is roughly in keeping with existing practice (zpool initialize
). Trying to express both just clutters it up, and I'm not some longopt absolutist!How Has This Been Tested?
By hand. For all commands change, made sure
-j
and--json
appear to do the same thing. Special double-check forzfs mount
andzfs unmount
, which is slightly twisted. Everything looks good to me!Update:
json_sanity
updated by request, now checking both forms.Types of changes
Checklist:
Signed-off-by
.