From: Chris Dunlap Date: Fri, 10 Apr 2015 19:56:21 +0000 (-0700) Subject: Fix io-spare.sh to work with disk vdevs X-Git-Tag: zfs-0.7.12~1501 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=de6d1976835959275fbdc00d74bb8fb86071f079;p=mirror_zfs.git Fix io-spare.sh to work with disk vdevs The "zpool status" output shows the full pathname for file-type vdevs, but only the basename component for disk-type vdevs. In commit bee6665, the "basename" command was dropped from altering the vdev name used when searching the "zpool status" output. Consequently, hot-disk sparing for disk vdevs broke since "zpool status" output was now being searched for the full pathname to the disk vdev. Parsing the "zpool status" output in this manner is rather brittle. It would be preferable to search for the vdev based on its guid. But until that happens, this commit adds back the "basename" command to fix the vdev name breakage. Signed-off-by: Chris Dunlap Signed-off-by: Brian Behlendorf Closes #3310 --- diff --git a/cmd/zed/zed.d/io-spare.sh b/cmd/zed/zed.d/io-spare.sh index 2fcbfb791..b64b2a9f1 100755 --- a/cmd/zed/zed.d/io-spare.sh +++ b/cmd/zed/zed.d/io-spare.sh @@ -54,7 +54,7 @@ flock -x 8 # Given a and return the status, (ONLINE, FAULTED, etc...). vdev_status() { local POOL=$1 - local VDEV=$2 + local VDEV=`basename $2` local T=' ' # tab character since '\t' isn't portable ${ZPOOL} status ${POOL} | sed -n -e \