c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't run 'zpool iostat -c CMD' command on all vdevs, if vdevs specified

Browse Source 
zpool iostat allows you to specify only certain vdevs to display.
Currently, if you run 'zpool iostat -c CMD vdev1 vdev2 ...'
on specific vdevs, it will actually run the command on *all* vdevs,
and just display the results for the vdevs you specify.  This patch
corrects the behavior to only run the command on the specified vdevs,
and also enables the zpool_iostat_005_pos.ksh tests.
    
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #5443
This commit is contained in:
Tony Hutter
2016-12-16 16:10:45 -08:00
committed by Brian Behlendorf
parent 81eb8a1fbb
commit 1528bfdb14
5 changed files with 81 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/runfiles/linux.run
+2 -1
View File
@@ -362,7 +362,8 @@ user =
[tests/functional/cli_user/zpool_iostat]
tests = ['zpool_iostat_001_neg', 'zpool_iostat_002_pos',
'zpool_iostat_003_neg', 'zpool_iostat_004_pos']
'zpool_iostat_003_neg', 'zpool_iostat_004_pos',
'zpool_iostat_005_pos']
user =
[tests/functional/cli_user/zpool_list]
tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh
+20 -3
View File
@@ -54,10 +54,27 @@ fi
# a '/' when we specify the path (-P) flag. We check for "{}" to see if one
# of the VDEV variables isn't set.
#
C1=$($ZPOOL iostat -Pv | $GREP -E '^\s+/' | $WC -l)
C2=$($ZPOOL iostat -Pv -c 'echo vdev_test{$VDEV_PATH}{$VDEV_UPATH}' | $GREP -E '^\s+/' | $GREP -v '{}' | $WC -l)
C1=$($ZPOOL iostat -Pv $testpool | $GREP -E '^\s+/' | $WC -l)
C2=$($ZPOOL iostat -Pv -c 'echo vdev_test{$VDEV_PATH}{$VDEV_UPATH}' $testpool \
| $GREP -E '^\s+/' | $GREP -v '{}' | $WC -l)
if [ "$C1" != "$C2" ] ; then
log_fail "zpool iostat -c failed, expected $C1 vdevs, got $C2"
else
log_pass "zpool iostat -c passed, expected $C1 vdevs, got $C2"
log_note "zpool iostat -c passed, expected $C1 vdevs, got $C2"
fi
# Call iostat on only a specific vdev, and verify that the command only gets
# run on the vdev. We write the command results to a temp file to verify that
# the command actually gets run, rather than just verifying that the results
# are *displayed* for the specific vdev.
TMP=$($MKTEMP)
FIRST_VDEV=$($ZPOOL iostat -Pv $testpool | $GREP -Eo '^\s+/[^ ]+' | $HEAD -n 1)
log_must $ZPOOL iostat -Pv -c "echo \$VDEV_PATH >> $TMP" $testpool \
$FIRST_VDEV > /dev/null
C2=$($WC -w < $TMP)
$RM $TMP
if [ "$C2" != "1" ] ; then
log_fail "zpool iostat -c <VDEV> failed, expected 1 vdev, got $C2"
else
log_note "zpool iostat -c <VDEV> passed, expected 1 vdev, got $C2"
fi