Make zpool status dedup table support raw bytes -p output #17926
+39
−17
Conversation
This file contains hidden or 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
github-actions
bot
added
the
Status: Work in Progress
Adi-Goll
force-pushed
the
adding-pflag-for-ddt-dump
branch
2 times, most recently
from
470a20d to
e05bd74
Compare
github-actions
bot
added
Status: Code Review Needed
github-actions
bot
added
Status: Work in Progress
Adi-Goll
force-pushed
the
adding-pflag-for-ddt-dump
branch
from
e05bd74 to
1d3713c
Compare
github-actions
bot
added
Status: Code Review Needed
Adi-Goll
force-pushed
the
adding-pflag-for-ddt-dump
branch
2 times, most recently
from
449d460 to
7ddd5b0
Compare
Check if -p flag is enabled, and if so print dedup table with raw bytes. Restructure the logic in zutil_pool to check if -p flag is enabled before calling zfs_nicenum() and zfs_nicebytes(). Signed-off-by: Adi Gollamudi <[email protected]> Fixes openzfs#11626
Boolean_t paramater "parsable" was added to zpool_dump_ddt(). This updates ABI files accordingly. Signed-off-by: Adi Gollamudi <[email protected]>
Adi-Goll
force-pushed
the
adding-pflag-for-ddt-dump
branch
from
7ddd5b0 to
99578b7
Compare
github-actions
bot
added
Status: Work in Progress
github-actions
bot
added
Status: Code Review Needed
Contributor
Author
|
@amotin @behlendorf No worries if there are more pressing reviews going on right now, but I just wanted to follow up on this. |
behlendorf
reviewed
Dec 9, 2025
| fmt_num(parsable, dds->dds_ref_blocks, ref_blocks, sizeof (ref_blocks)); | ||
| fmt_bytes(parsable, dds->dds_ref_lsize, ref_lsize, sizeof (ref_lsize)); | ||
| fmt_bytes(parsable, dds->dds_ref_psize, ref_psize, sizeof (ref_psize)); | ||
| fmt_bytes(parsable, dds->dds_ref_dsize, ref_dsize, sizeof (ref_dsize)); |
Contributor
There was a problem hiding this comment.
You should be able to use the existing zfs_nicenum_format() function here and either specify the ZFS_NICENUM_BYTES or ZFS_NICENUM_RAW for the formatting.
| (void) printf("%s: object=%llu\n", name, | ||
| (u_longlong_t)ddt->ddt_object[type][class]); | ||
| zpool_dump_ddt(NULL, &ddt->ddt_histogram[type][class]); | ||
| zpool_dump_ddt(NULL, &ddt->ddt_histogram[type][class], B_TRUE); |
Contributor
There was a problem hiding this comment.
We need to honor the -P / --parseable flag here and below. Something like:
zpool_dump_ddt(NULL, &ddt->ddt_histogram[type][class], dump_opt['P'] > 0);
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Check if
-pflag is enabled, and if so print dedup table with raw bytes. Restructure the logic in zutil_pool to check if-pflag is enabled before callingzfs_nicenum()andzfs_nicebytes(). Other files changed update the call to/header declaration ofdump_ddt_stat()to include a new variable: boolean_t parsable, indicating whether or not-pwas usedThis PR also includes updates to the ABI files because the function header for zpool_dump_ddt() was modified to include a new parameter which indicates if the
-pflag was used.Fixes #11626
How Has This Been Tested?
Before this PR, when
-pwasn't supported (equivalent of running the command with just-D):zpool status -D -p testpool pool: testpool state: ONLINE config: NAME STATE READ WRITE CKSUM testpool ONLINE 0 0 0 mirror-0 ONLINE 0 0 0 /tmp/zdisks/disk1.img ONLINE 0 0 0 /tmp/zdisks/disk2.img ONLINE 0 0 0 errors: No known data errors dedup: DDT entries 317, size 118K on disk, 96K in core bucket allocated referenced ______ ______________________________ ______________________________ refcnt blocks LSIZE PSIZE DSIZE blocks LSIZE PSIZE DSIZE ------ ------ ----- ----- ----- ------ ----- ----- ----- 1 317 39.6M 39.6M 39.6M 317 39.6M 39.6M 39.6M Total 317 39.6M 39.6M 39.6M 317 39.6M 39.6M 39.6MAfter this PR:
zpool status -D -p testpool pool: testpool state: ONLINE config: NAME STATE READ WRITE CKSUM testpool ONLINE 0 0 0 mirror-0 ONLINE 0 0 0 /tmp/zdisks/disk1.img ONLINE 0 0 0 /tmp/zdisks/disk2.img ONLINE 0 0 0 errors: No known data errors dedup: DDT entries 317, size 121344 on disk, 98304 in core bucket allocated referenced ______ ______________________________ ______________________________ refcnt blocks LSIZE PSIZE DSIZE blocks LSIZE PSIZE DSIZE ------ ------ ----- ----- ----- ------ ----- ----- ----- 1 317 41549 41549 41549 317 41549 41549 41549 Total 317 41549 41549 41549 317 41549 41549 41549Types of changes
Checklist:
Signed-off-by.