c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-04-12 22:51:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make zpool status dedup table support raw bytes -p output

Browse Source 
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 printing either the bytes or raw numbers.

Calls to print the data for DDT now all use
zfs_nicenum_format(). Increased DDT histogram column buffers
to 32 bytes to prevent truncation when -p is enabled.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Signed-off-by: Adi Gollamudi <adigollamudi@gmail.com>
Closes #11626
Closes #17926
This commit is contained in:
Aditya Gollamudi 2026-03-13 09:53:56 -07:00 committed by GitHub
parent 4d78b14c14
commit b481a8bbbf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zdb/zdb.c
View File

@ -2144,7 +2144,8 @@ dump_ddt_object(ddt_t *ddt, ddt_type_t type, ddt_class_t class)
(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],
dump_opt['P'] > 0);
if (dump_opt['D'] < 4)
return;
@ -2221,7 +2222,7 @@ dump_all_ddts(spa_t *spa)
if (dump_opt['D'] > 1) {
(void) printf("DDT histogram (aggregated over all DDTs):\n");
ddt_get_dedup_histogram(spa, &ddh_total);
zpool_dump_ddt(&dds_total, &ddh_total);
zpool_dump_ddt(&dds_total, &ddh_total, dump_opt['P'] > 0);
}
dump_dedup_ratio(&dds_total);
@ -8118,7 +8119,7 @@ dump_simulated_ddt(spa_t *spa)
(void) printf("Simulated DDT histogram:\n");
zpool_dump_ddt(&dds_total, &ddh_total);
zpool_dump_ddt(&dds_total, &ddh_total, dump_opt['P'] > 0);
dump_dedup_ratio(&dds_total);
}

2
cmd/zpool/zpool_main.c
View File

@ -10495,7 +10495,7 @@ print_dedup_stats(zpool_handle_t *zhp, nvlist_t *config, boolean_t literal)
(uint64_t **)&dds, &c) == 0);
verify(nvlist_lookup_uint64_array(config, ZPOOL_CONFIG_DDT_HISTOGRAM,
(uint64_t **)&ddh, &c) == 0);
zpool_dump_ddt(dds, ddh);
zpool_dump_ddt(dds, ddh, literal);
}
#define ST_SIZE 4096

3
include/libzutil.h
View File

@ -167,7 +167,8 @@ _LIBZUTIL_H void zfs_niceraw(uint64_t, char *, size_t);
#define nicenum(num, buf, size) zfs_nicenum(num, buf, size)
#define NN_NUMBUF_SZ (6)
_LIBZUTIL_H void zpool_dump_ddt(const ddt_stat_t *, const ddt_histogram_t *);
_LIBZUTIL_H void zpool_dump_ddt(const ddt_stat_t *, const ddt_histogram_t *,
boolean_t parsable);
_LIBZUTIL_H int zpool_history_unpack(char *, uint64_t, uint64_t *, nvlist_t ***,
uint_t *);
_LIBZUTIL_H void fsleep(float sec);

1
lib/libzfs/libzfs.abi
View File

@ -9871,6 +9871,7 @@
<function-decl name='zpool_dump_ddt' mangled-name='zpool_dump_ddt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_dump_ddt'>
<parameter type-id='dfe59052' name='dds_total'/>
<parameter type-id='932720f8' name='ddh'/>
<parameter type-id='c19b74c3' name='parsable'/>
<return type-id='48b5725f'/>
</function-decl>
<function-decl name='fsleep' mangled-name='fsleep' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fsleep'>

48
lib/libzutil/zutil_pool.c
View File

@ -34,11 +34,16 @@
#include <libzutil.h>
static void
dump_ddt_stat(const ddt_stat_t *dds, int h)
dump_ddt_stat(const ddt_stat_t *dds, int h, boolean_t parsable)
{
char refcnt[6];
char blocks[6], lsize[6], psize[6], dsize[6];
char ref_blocks[6], ref_lsize[6], ref_psize[6], ref_dsize[6];
char refcnt[32];
char blocks[32], lsize[32], psize[32], dsize[32];
char ref_blocks[32], ref_lsize[32], ref_psize[32], ref_dsize[32];
enum zfs_nicenum_format count_format = parsable ?
ZFS_NICENUM_RAW : ZFS_NICENUM_1024;
enum zfs_nicenum_format byte_format = parsable ?
ZFS_NICENUM_RAW : ZFS_NICENUM_BYTES;
if (dds == NULL || dds->dds_blocks == 0)
return;
@ -46,16 +51,26 @@ dump_ddt_stat(const ddt_stat_t *dds, int h)
if (h == -1)
(void) strcpy(refcnt, "Total");
else
zfs_nicenum(1ULL << h, refcnt, sizeof (refcnt));
zfs_nicenum_format(1ULL << h, refcnt, sizeof (refcnt),
count_format);
zfs_nicenum(dds->dds_blocks, blocks, sizeof (blocks));
zfs_nicebytes(dds->dds_lsize, lsize, sizeof (lsize));
zfs_nicebytes(dds->dds_psize, psize, sizeof (psize));
zfs_nicebytes(dds->dds_dsize, dsize, sizeof (dsize));
zfs_nicenum(dds->dds_ref_blocks, ref_blocks, sizeof (ref_blocks));
zfs_nicebytes(dds->dds_ref_lsize, ref_lsize, sizeof (ref_lsize));
zfs_nicebytes(dds->dds_ref_psize, ref_psize, sizeof (ref_psize));
zfs_nicebytes(dds->dds_ref_dsize, ref_dsize, sizeof (ref_dsize));
zfs_nicenum_format(dds->dds_blocks, blocks, sizeof (blocks),
count_format);
zfs_nicenum_format(dds->dds_lsize, lsize, sizeof (lsize),
byte_format);
zfs_nicenum_format(dds->dds_psize, psize, sizeof (psize),
byte_format);
zfs_nicenum_format(dds->dds_dsize, dsize, sizeof (dsize),
byte_format);
zfs_nicenum_format(dds->dds_ref_blocks, ref_blocks,
sizeof (ref_blocks), count_format);
zfs_nicenum_format(dds->dds_ref_lsize, ref_lsize,
sizeof (ref_lsize), byte_format);
zfs_nicenum_format(dds->dds_ref_psize, ref_psize,
sizeof (ref_psize), byte_format);
zfs_nicenum_format(dds->dds_ref_dsize, ref_dsize,
sizeof (ref_dsize), byte_format);
(void) printf("%6s %6s %5s %5s %5s %6s %5s %5s %5s\n",
refcnt,
@ -67,7 +82,8 @@ dump_ddt_stat(const ddt_stat_t *dds, int h)
* Print the DDT histogram and the column totals.
*/
void
zpool_dump_ddt(const ddt_stat_t *dds_total, const ddt_histogram_t *ddh)
zpool_dump_ddt(const ddt_stat_t *dds_total, const ddt_histogram_t *ddh,
boolean_t parsable)
{
int h;
@ -91,9 +107,9 @@ zpool_dump_ddt(const ddt_stat_t *dds_total, const ddt_histogram_t *ddh)
"------", "-----", "-----", "-----");
for (h = 0; h < 64; h++)
dump_ddt_stat(&ddh->ddh_stat[h], h);
dump_ddt_stat(&ddh->ddh_stat[h], h, parsable);
dump_ddt_stat(dds_total, -1);
dump_ddt_stat(dds_total, -1, parsable);
(void) printf("\n");
}