diff options
| author | Akash B <[email protected]> | 2022-02-04 03:59:29 +0530 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2022-02-16 17:58:55 -0800 |
| commit | 9221ff1888c9d8b80ffd9c45b44231ad19c0e9fb (patch) | |
| tree | c1ada1b0d5a60968453afa8269a646b2e37e5d33 /tests/zfs-tests | |
| parent | 72a82f312f9fd0abd5b15f1d847e448a56353ec7 (diff) | |
Add enumerated vdev names to 'zpool iostat -v' and 'zpool list -v'
This commit adds enumerated names to disambiguate between the
different vdevs. Previously only 'zpool status' showed enumerated
vdev names, now 'zpool list -v' and 'zpool iostat -v' also shows
the enumerated vdev names.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Dipak Ghosh <[email protected]>
Signed-off-by: Akash B <[email protected]>
Closes #12510
Closes #13031
Diffstat (limited to 'tests/zfs-tests')
| -rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 2 | ||||
| -rw-r--r-- | tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 773d134e3..8a41b960f 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -2145,7 +2145,7 @@ function get_disklist # pool disklist=$(zpool iostat -v $1 | nawk '(NR >4) {print $1}' | \ grep -v "\-\-\-\-\-" | \ - egrep -v -e "^(mirror|raidz[1-3]|spare|log|cache|special|dedup)$") + egrep -v -e "^(mirror|raidz[1-3]|draid[1-3]|spare|log|cache|special|dedup)|\-[0-9]$") echo $disklist } diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib b/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib index baee8269b..988803466 100644 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib @@ -243,7 +243,7 @@ function get_vdevs #pool cnt typeset -i cnt=$2 typeset all_devs=$(zpool iostat -v $pool | awk '{print $1}'| \ - egrep -v "^pool$|^capacity$|^mirror$|^raidz1$|^raidz2$|^raidz3$|^draid1.*|^draid2.*|^draid3.*|---" | \ + egrep -v "^pool$|^capacity$|^mirror\-[0-9]$|^raidz[1-3]\-[0-9]$|^draid[1-3].*\-[0-9]$|---" | \ egrep -v "/old$|^$pool$") typeset -i i=0 typeset vdevs |