diff options
author | Tony Hutter <[email protected]> | 2016-11-29 13:45:38 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2016-11-29 14:45:38 -0700 |
commit | 8720e9e7482fa2dce4f34c56d3c7451833413d7d (patch) | |
tree | 2475bb498ab7bc8e5fb016dbca1a337d10f257c5 /cmd/zpool/zpool_util.h | |
parent | 2f71caf2d926249920d1b9162550c56715cc6461 (diff) |
Add -c to zpool iostat & status to run command
This patch adds a command (-c) option to zpool status and zpool iostat. The
-c option allows you to run an arbitrary command on each vdev and display
the first line of output in zpool status/iostat. The environment vars
VDEV_PATH and VDEV_UPATH are set to the vdev's path and "underlying path"
before running the command. For device mapper, multipath, or partitioned
vdevs, VDEV_UPATH is the actual underlying /dev/sd* disk. This can be useful
if the command you're running requires a /dev/sd* device.
The patch also uses /sys/block/<dev>/slaves/ to lookup the underlying device
instead of using libdevmapper. This not only removes the libdevmapper
requirement at build time, but also allows you to resolve device mapper
devices without being root. This means that UDEV_UPATH get set correctly
when running zpool status/iostat as an unprivileged user.
Example:
$ zpool status -c 'echo I am $VDEV_PATH, $VDEV_UPATH'
NAME STATE READ WRITE CKSUM
mypool ONLINE 0 0 0
mirror-0 ONLINE 0 0 0
mpatha ONLINE 0 0 0 I am /dev/mapper/mpatha, /dev/sdc
sdb ONLINE 0 0 0 I am /dev/sdb1, /dev/sdb
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #5368
Diffstat (limited to 'cmd/zpool/zpool_util.h')
-rw-r--r-- | cmd/zpool/zpool_util.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h index f279fd5dd..811619602 100644 --- a/cmd/zpool/zpool_util.h +++ b/cmd/zpool/zpool_util.h @@ -72,6 +72,27 @@ void pool_list_remove(zpool_list_t *, zpool_handle_t *); libzfs_handle_t *g_zfs; + +typedef struct vdev_cmd_data +{ + char *line; /* cmd output */ + char *path; /* vdev path */ + char *upath; /* vdev underlying path */ + char *pool; /* Pool name */ + char *cmd; /* backpointer to cmd */ +} vdev_cmd_data_t; + +typedef struct vdev_cmd_data_list +{ + char *cmd; /* Command to run */ + unsigned int count; /* Number of vdev_cmd_data items (vdevs) */ + vdev_cmd_data_t *data; /* Array of vdevs */ +} vdev_cmd_data_list_t; + +vdev_cmd_data_list_t * all_pools_for_each_vdev_run(int argc, char **argv, + char *cmd); +void free_vdev_cmd_data_list(vdev_cmd_data_list_t *vcdl); + #ifdef __cplusplus } #endif |