diff options
| author | George G <[email protected]> | 2017-11-05 21:09:56 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-11-05 13:09:56 -0800 |
| commit | 2df9ad1c075cfca3cf5acb64950a91e2284f6338 (patch) | |
| tree | 53973a6661e841697960bb1fbcef5a37d56ee848 /lib | |
| parent | cd1813d36e78ce21fa0b0e48b050e0493f9f6c93 (diff) | |
Fix column alignment with long zpool names
`zpool status` normally aligns NAME/STATE/etc columns:
NAME STATE READ WRITE CKSUM
dummy ONLINE 0 0 0
mirror-0 ONLINE 0 0 0
/tmp/dummy-long-1.bin ONLINE 0 0 0
/tmp/dummy-long-2.bin ONLINE 0 0 0
mirror-1 ONLINE 0 0 0
/tmp/dummy-long-3.bin ONLINE 0 0 0
/tmp/dummy-long-4.bin ONLINE 0 0 0
However, if the zpool name is longer than the zvol names, alignment
issues arise:
NAME STATE READ WRITE CKSUM
dummy-very-very-long-zpool-name ONLINE 0 0 0
mirror-0 ONLINE 0 0 0
/tmp/dummy-1.bin ONLINE 0 0 0
/tmp/dummy-2.bin ONLINE 0 0 0
mirror-1 ONLINE 0 0 0
/tmp/dummy-3.bin ONLINE 0 0 0
/tmp/dummy-4.bin ONLINE 0 0 0
`zpool iostat` and `zpool import` are also affected:
capacity operations bandwidth
pool alloc free read write read write
---------- ----- ----- ----- ----- ----- -----
dummy 104K 1.97G 0 0 152 9.84K
dummy-very-very-long-zpool-name 152K 1.97G 0 1 144 13.1K
---------- ----- ----- ----- ----- ----- -----
dummy-very-very-long-zpool-name ONLINE
mirror-0 ONLINE
/tmp/dummy-1.bin ONLINE
/tmp/dummy-2.bin ONLINE
mirror-1 ONLINE
/tmp/dummy-3.bin ONLINE
/tmp/dummy-4.bin ONLINE
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: George Gaydarov <[email protected]>
Closes #6786
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libzfs/libzfs_pool.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index aa77b547a..46fb99aff 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -3588,6 +3588,14 @@ zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv, char buf[PATH_BUF_LEN]; char tmpbuf[PATH_BUF_LEN]; + /* + * vdev_name will be "root"/"root-0" for the root vdev, but it is the + * zpool name that will be displayed to the user. + */ + verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0); + if (zhp != NULL && strcmp(type, "root") == 0) + return (zfs_strdup(hdl, zpool_get_name(zhp))); + env = getenv("ZPOOL_VDEV_NAME_PATH"); if (env && (strtoul(env, NULL, 0) > 0 || !strncasecmp(env, "YES", 3) || !strncasecmp(env, "ON", 2))) @@ -3669,7 +3677,6 @@ zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv, /* * For a block device only use the name. */ - verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0); if ((strcmp(type, VDEV_TYPE_DISK) == 0) && !(name_flags & VDEV_NAME_PATH)) { path = strrchr(path, '/'); @@ -3684,7 +3691,7 @@ zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv, return (zfs_strip_partition(path)); } } else { - verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &path) == 0); + path = type; /* * If it's a raidz device, we need to stick in the parity level. |