[TEST] Troubleshooting auto_spare_002_pos

Requires-builders: test
openzfs · Nov 24, 2017 · b49d8e9 · b49d8e9
1 parent b3f1924
commit b49d8e9
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 1 deletion.
diff --git a/TEST b/TEST
@@ -32,7 +32,7 @@ TEST_XFSTESTS_SKIP="yes"
 #TEST_XFSTESTS_OPTIONS=""
 
 ### zfs-tests.sh
-#TEST_ZFSTESTS_SKIP="yes"
+TEST_ZFSTESTS_SKIP="yes"
 #TEST_ZFSTESTS_DIR="/mnt/"
 #TEST_ZFSTESTS_DISKS="vdb vdc vdd"
 #TEST_ZFSTESTS_DISKSIZE="8G"
@@ -84,8 +84,10 @@ SUSE*)
 Ubuntu-16.04*)
     # ZFS enabled xfstests fails to build
     TEST_XFSTESTS_SKIP="yes"
+    TEST_ZFSTESTS_SKIP="no"
     ;;
 Ubuntu*)
+    TEST_ZFSTESTS_SKIP="no"
     ;;
 *)
     ;;

diff --git a/tests/test-runner/include/logapi.shlib b/tests/test-runner/include/logapi.shlib
@@ -304,6 +304,7 @@ function log_pass
 
 function log_fail
 {
+	touch "/tmp/fail.lck"
 	_endlog $STF_FAIL "$@"
 }
 

diff --git a/tests/zfs-tests/tests/functional/fault/auto_online_001_pos.ksh b/tests/zfs-tests/tests/functional/fault/auto_online_001_pos.ksh
@@ -58,6 +58,8 @@ function cleanup
 	unload_scsi_debug
 }
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 log_assert "Testing automated auto-online FMA test"
 
 log_onexit cleanup

diff --git a/tests/zfs-tests/tests/functional/fault/auto_replace_001_pos.ksh b/tests/zfs-tests/tests/functional/fault/auto_replace_001_pos.ksh
@@ -76,6 +76,8 @@ function cleanup
 	unload_scsi_debug
 }
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 log_assert "Testing automated auto-replace FMA test"
 
 log_onexit cleanup

diff --git a/tests/zfs-tests/tests/functional/fault/auto_spare_001_pos.ksh b/tests/zfs-tests/tests/functional/fault/auto_spare_001_pos.ksh
@@ -46,6 +46,8 @@ function cleanup
 	rm -f $VDEV_FILES $SPARE_FILE
 }
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 log_assert "Testing automated auto-spare FMA test"
 
 log_onexit cleanup

diff --git a/tests/zfs-tests/tests/functional/fault/auto_spare_002_pos.ksh b/tests/zfs-tests/tests/functional/fault/auto_spare_002_pos.ksh
@@ -41,11 +41,19 @@ verify_runnable "both"
 
 function cleanup
 {
+	if [[ -f "/tmp/fail.lck" ]]; then
+		ls -lh $ZED_LOG
+		zpool status -v
+		zpool events -v
+		cat $ZED_LOG
+	fi
 	log_must zinject -c all
 	destroy_pool $TESTPOOL
 	rm -f $VDEV_FILES $SPARE_FILE
 }
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 log_assert "Testing automated auto-spare FMA test"
 
 log_onexit cleanup

diff --git a/tests/zfs-tests/tests/functional/fault/auto_spare_ashift.ksh b/tests/zfs-tests/tests/functional/fault/auto_spare_ashift.ksh
@@ -49,6 +49,8 @@ function cleanup
 	rm -f $SAFE_DEVICE $FAIL_DEVICE
 }
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 log_assert "ZED should replace a device using the configured ashift property"
 log_onexit cleanup
 

diff --git a/tests/zfs-tests/tests/functional/fault/auto_spare_multiple.ksh b/tests/zfs-tests/tests/functional/fault/auto_spare_multiple.ksh
@@ -50,6 +50,8 @@ function cleanup
 	rm -f $DATA_DEVS $SPARE_DEVS
 }
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 log_assert "ZED should be able to handle multiple faulted devices"
 log_onexit cleanup
 

diff --git a/tests/zfs-tests/tests/functional/fault/cleanup.ksh b/tests/zfs-tests/tests/functional/fault/cleanup.ksh
@@ -28,6 +28,8 @@
 
 verify_runnable "global"
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 cleanup_devices $DISKS
 
 zed_stop

diff --git a/tests/zfs-tests/tests/functional/fault/setup.ksh b/tests/zfs-tests/tests/functional/fault/setup.ksh
@@ -28,6 +28,8 @@
 
 verify_runnable "global"
 
+[[ -f "/tmp/fail.lck" ]] && log_unsupported ""
+
 zed_setup
 zed_start
-Original file line number
+Diff line change
@@ Expand Up / @@ -304,6 +304,7 @@ function log_pass @@
     function log_fail
     {
+    	touch "/tmp/fail.lck"
     	_endlog $STF_FAIL "$@"
     }
@@ Expand Down @@