Whamcloud - gitweb
LU-9792 tests: t-f do not create empty files for ZFS 05/34105/7
authorAlex Zhuravlev <bzzz@whamcloud.com>
Thu, 24 Jan 2019 13:24:26 +0000 (16:24 +0300)
committerOleg Drokin <green@whamcloud.com>
Wed, 10 Jul 2019 15:16:00 +0000 (15:16 +0000)
as zpool doesn't like empty device files.

Change-Id: I3a224bf2e60c6f20e13013caf827fe29641a8c5c
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/34105
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/tests/test-framework.sh

index 3a442b3..e842f10 100755 (executable)
@@ -4424,6 +4424,9 @@ __touch_device()
        [[ ! "$device" =~ ^/dev/ ]] || [[ "$device" =~ ^/dev/shm/ ]] ||
                error "$facet: device '$device' does not exist"
 
+       # zpool create doesn't like empty files
+       [[ $(facet_fstype $facet) == zfs ]] && return 0
+
        do_facet $facet "touch \"${device}\""
 }