c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-01-25 10:12:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

zpool: fix special vdev -v -o conflict

Browse Source 
Right now, running `zpool list` with -v and -o passed
does not work properly for special vdevs. This commit
fixes that problem.

See the discussion on #17839.
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Shreshth Srivastava <shreshthsrivastava2@gmail.com>
Closes #17932
This commit is contained in:
Shreshth3 2025-11-19 08:30:20 -08:00 committed by Brian Behlendorf
parent d06ebddee4
commit c8ecd63acd
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
cmd/zpool/zpool_main.c
View File

@ -6746,10 +6746,12 @@ typedef struct list_cbdata {
/* /*
* Given a list of columns to display, output appropriate headers for each one. * Given a list of columns to display, print an appropriate line. If
* `vdev_name` is not NULL, we print `vdev_name` followed by a line of dashes.
* If `vdev_name` is NULL, we print a line of the headers.
*/ */
static void static void
print_header(list_cbdata_t *cb) print_line(list_cbdata_t *cb, const char *vdev_name)
{ {
zprop_list_t *pl = cb->cb_proplist; zprop_list_t *pl = cb->cb_proplist;
char headerbuf[ZPOOL_MAXPROPLEN]; char headerbuf[ZPOOL_MAXPROPLEN];
@ -6758,6 +6760,8 @@ print_header(list_cbdata_t *cb)
boolean_t right_justify; boolean_t right_justify;
size_t width = 0; size_t width = 0;
boolean_t print_header = (vdev_name == NULL);
for (; pl != NULL; pl = pl->pl_next) { for (; pl != NULL; pl = pl->pl_next) {
width = pl->pl_width; width = pl->pl_width;
if (first && cb->cb_verbose) { if (first && cb->cb_verbose) {
@ -6770,20 +6774,36 @@ print_header(list_cbdata_t *cb)
if (!first) if (!first)
(void) fputs(" ", stdout); (void) fputs(" ", stdout);
else
first = B_FALSE;
right_justify = B_FALSE; if (print_header) {
if (pl->pl_prop != ZPROP_USERPROP) { right_justify = B_FALSE;
header = zpool_prop_column_name(pl->pl_prop); if (pl->pl_prop != ZPROP_USERPROP) {
right_justify = zpool_prop_align_right(pl->pl_prop); header = zpool_prop_column_name(pl->pl_prop);
} else { right_justify = zpool_prop_align_right(
int i; pl->pl_prop);
} else {
int i;
for (i = 0; pl->pl_user_prop[i] != '\0'; i++) for (i = 0; pl->pl_user_prop[i] != '\0'; i++)
headerbuf[i] = toupper(pl->pl_user_prop[i]); headerbuf[i] = toupper(
headerbuf[i] = '\0'; pl->pl_user_prop[i]);
header = headerbuf; headerbuf[i] = '\0';
header = headerbuf;
}
}
/*
* If `print_header` is false, we want to print a line of
* dashes.
*/
else {
if (first) {
header = vdev_name;
right_justify = B_FALSE;
} else {
header = "-";
right_justify = B_TRUE;
}
} }
if (pl->pl_next == NULL && !right_justify) if (pl->pl_next == NULL && !right_justify)
@ -6792,6 +6812,9 @@ print_header(list_cbdata_t *cb)
(void) printf("%*s", (int)width, header); (void) printf("%*s", (int)width, header);
else else
(void) printf("%-*s", (int)width, header); (void) printf("%-*s", (int)width, header);
if (first)
first = B_FALSE;
} }
(void) fputc('\n', stdout); (void) fputc('\n', stdout);
@ -6996,8 +7019,6 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
uint64_t islog = B_FALSE; uint64_t islog = B_FALSE;
nvlist_t *props, *ent, *ch, *obj, *l2c, *sp; nvlist_t *props, *ent, *ch, *obj, *l2c, *sp;
props = ent = ch = obj = sp = l2c = NULL; props = ent = ch = obj = sp = l2c = NULL;
const char *dashes = "%-*s - - - - "
"- - - - -\n";
verify(nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS, verify(nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS,
(uint64_t **)&vs, &c) == 0); (uint64_t **)&vs, &c) == 0);
@ -7159,9 +7180,7 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
continue; continue;
if (!printed && !cb->cb_json) { if (!printed && !cb->cb_json) {
/* LINTED E_SEC_PRINTF_VAR_FMT */ print_line(cb, class_name[n]);
(void) printf(dashes, cb->cb_namewidth,
class_name[n]);
printed = B_TRUE; printed = B_TRUE;
} }
vname = zpool_vdev_name(g_zfs, zhp, child[c], vname = zpool_vdev_name(g_zfs, zhp, child[c],
@ -7182,8 +7201,7 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
if (cb->cb_json) { if (cb->cb_json) {
l2c = fnvlist_alloc(); l2c = fnvlist_alloc();
} else { } else {
/* LINTED E_SEC_PRINTF_VAR_FMT */ print_line(cb, "cache");
(void) printf(dashes, cb->cb_namewidth, "cache");
} }
for (c = 0; c < children; c++) { for (c = 0; c < children; c++) {
vname = zpool_vdev_name(g_zfs, zhp, child[c], vname = zpool_vdev_name(g_zfs, zhp, child[c],
@ -7204,8 +7222,7 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
if (cb->cb_json) { if (cb->cb_json) {
sp = fnvlist_alloc(); sp = fnvlist_alloc();
} else { } else {
/* LINTED E_SEC_PRINTF_VAR_FMT */ print_line(cb, "spare");
(void) printf(dashes, cb->cb_namewidth, "spare");
} }
for (c = 0; c < children; c++) { for (c = 0; c < children; c++) {
vname = zpool_vdev_name(g_zfs, zhp, child[c], vname = zpool_vdev_name(g_zfs, zhp, child[c],
@ -7448,7 +7465,7 @@ zpool_do_list(int argc, char **argv)
if (!cb.cb_scripted && (first || cb.cb_verbose) && if (!cb.cb_scripted && (first || cb.cb_verbose) &&
!cb.cb_json) { !cb.cb_json) {
print_header(&cb); print_line(&cb, NULL);
first = B_FALSE; first = B_FALSE;
} }
ret = pool_list_iter(list, B_TRUE, list_callback, &cb); ret = pool_list_iter(list, B_TRUE, list_callback, &cb);