c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

zpool events: expand value strings for ZIO error values

Browse Source 
Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
This commit is contained in:
Rob Norris 2024-02-29 15:00:25 +11:00 committed by Tony Hutter
parent 82ff9aafd6
commit 17dd66deda
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/zpool/zpool_main.c
View File

@ -75,6 +75,7 @@
#include "zpool_util.h" #include "zpool_util.h"
#include "zfs_comutil.h" #include "zfs_comutil.h"
#include "zfeature_common.h" #include "zfeature_common.h"
#include "zfs_valstr.h"
#include "statcommon.h" #include "statcommon.h"
@ -11936,6 +11937,7 @@ static void
zpool_do_events_nvprint(nvlist_t *nvl, int depth) zpool_do_events_nvprint(nvlist_t *nvl, int depth)
{ {
nvpair_t *nvp; nvpair_t *nvp;
static char flagstr[256];
for (nvp = nvlist_next_nvpair(nvl, NULL); for (nvp = nvlist_next_nvpair(nvl, NULL);
nvp != NULL; nvp = nvlist_next_nvpair(nvl, nvp)) { nvp != NULL; nvp = nvlist_next_nvpair(nvl, nvp)) {
@ -11995,7 +11997,21 @@ zpool_do_events_nvprint(nvlist_t *nvl, int depth)
case DATA_TYPE_UINT32: case DATA_TYPE_UINT32:
(void) nvpair_value_uint32(nvp, &i32); (void) nvpair_value_uint32(nvp, &i32);
printf(gettext("0x%x"), i32); if (strcmp(name,
FM_EREPORT_PAYLOAD_ZFS_ZIO_STAGE) == 0 ||
strcmp(name,
FM_EREPORT_PAYLOAD_ZFS_ZIO_PIPELINE) == 0) {
zfs_valstr_zio_stage(i32, flagstr,
sizeof (flagstr));
printf(gettext("0x%x [%s]"), i32, flagstr);
} else if (strcmp(name,
FM_EREPORT_PAYLOAD_ZFS_ZIO_PRIORITY) == 0) {
zfs_valstr_zio_priority(i32, flagstr,
sizeof (flagstr));
printf(gettext("0x%x [%s]"), i32, flagstr);
} else {
printf(gettext("0x%x"), i32);
}
break; break;
case DATA_TYPE_INT64: case DATA_TYPE_INT64:
@ -12016,6 +12032,12 @@ zpool_do_events_nvprint(nvlist_t *nvl, int depth)
printf(gettext("\"%s\" (0x%llx)"), printf(gettext("\"%s\" (0x%llx)"),
zpool_state_to_name(i64, VDEV_AUX_NONE), zpool_state_to_name(i64, VDEV_AUX_NONE),
(u_longlong_t)i64); (u_longlong_t)i64);
} else if (strcmp(name,
FM_EREPORT_PAYLOAD_ZFS_ZIO_FLAGS) == 0) {
zfs_valstr_zio_flag(i64, flagstr,
sizeof (flagstr));
printf(gettext("0x%llx [%s]"),
(u_longlong_t)i64, flagstr);
} else { } else {
printf(gettext("0x%llx"), (u_longlong_t)i64); printf(gettext("0x%llx"), (u_longlong_t)i64);
} }