ktest: test_stress time depends on priority

Change-Id: I73f53d0bdb6aa5bf177492a32b6c099f2d5879d9

23 files changed, 51 insertions, 61 deletions

diff --git a/tests/bcache/bcache_add_remove.ktest b/tests/bcache/bcache_add_remove.ktest
index 57ac4d9..9dafb93 100755
--- a/tests/bcache/bcache_add_remove.ktest
+++ b/tests/bcache/bcache_add_remove.ktest
@@ -10,7 +10,7 @@ config-bucket-size 512k
 config-block-size 2k
 config-mem 1G
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
@@ -28,7 +28,7 @@ main()
     # can't start test_stress before adding the device, because test_stress
     # triggers dynamic faults in the background which breaks a kmalloc adding
     # the device
-    test_stress &
+    test_stress
 
     stop_bcache
 }
diff --git a/tests/bcache/bcache_backingdev.ktest b/tests/bcache/bcache_backingdev.ktest
index e3319d0..0706d0f 100755
--- a/tests/bcache/bcache_backingdev.ktest
+++ b/tests/bcache/bcache_backingdev.ktest
@@ -9,7 +9,7 @@ config-block-size 4k
 config-writeback
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_backingdev_reboot_fio.ktest b/tests/bcache/bcache_backingdev_reboot_fio.ktest
index 57ff2ad..e4ca52d 100755
--- a/tests/bcache/bcache_backingdev_reboot_fio.ktest
+++ b/tests/bcache/bcache_backingdev_reboot_fio.ktest
@@ -11,7 +11,7 @@ config-mem 512M
 config-cpus 1
 
 nr_iterations=$((($ktest_priority + 1) * 5))
-config-timeout $(($nr_iterations * 60))
+config-timeout $(($nr_iterations * 45 + $(stress_timeout)))
 
 main()
 {
diff --git a/tests/bcache/bcache_backingdev_reboot_fs.ktest b/tests/bcache/bcache_backingdev_reboot_fs.ktest
index def945e..7d3a145 100755
--- a/tests/bcache/bcache_backingdev_reboot_fs.ktest
+++ b/tests/bcache/bcache_backingdev_reboot_fs.ktest
@@ -11,7 +11,7 @@ config-mem 512M
 config-cpus 1
 
 nr_iterations=$((($ktest_priority + 1) * 5))
-config-timeout $(($nr_iterations * 60))
+config-timeout $(($nr_iterations * 45 + $(stress_timeout)))
 
 main()
 {
diff --git a/tests/bcache/bcache_backingdev_unregister.ktest b/tests/bcache/bcache_backingdev_unregister.ktest
index 3c0917b..2bbb84e 100755
--- a/tests/bcache/bcache_backingdev_unregister.ktest
+++ b/tests/bcache/bcache_backingdev_unregister.ktest
@@ -9,7 +9,7 @@ config-block-size 4k
 config-writeback
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_backingdev_writethrough.ktest b/tests/bcache/bcache_backingdev_writethrough.ktest
index 47ba75b..c7d1ce6 100755
--- a/tests/bcache/bcache_backingdev_writethrough.ktest
+++ b/tests/bcache/bcache_backingdev_writethrough.ktest
@@ -8,7 +8,7 @@ config-bucket-size 64k
 config-block-size 4k
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_device_remove.ktest b/tests/bcache/bcache_device_remove.ktest
index d04dbf4..4a75f90 100755
--- a/tests/bcache/bcache_device_remove.ktest
+++ b/tests/bcache/bcache_device_remove.ktest
@@ -10,7 +10,7 @@ config-volume 500M
 config-mem 512M
 config-data-replicas 2
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_discard.ktest b/tests/bcache/bcache_discard.ktest
index 8725acf..d20d8e0 100755
--- a/tests/bcache/bcache_discard.ktest
+++ b/tests/bcache/bcache_discard.ktest
@@ -8,7 +8,7 @@ require-container ioctl_test
 config-scratch-devs 2G
 config-mem 512M
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 mb_to_sec()
 {
@@ -69,7 +69,6 @@ main()
    
     echo "------- FIO TEST -------- "
 
-    SIZE=small
     test_fio
 
     bch_ioctl list_keys       1 0 0 100 100
diff --git a/tests/bcache/bcache_flash_dev.ktest b/tests/bcache/bcache_flash_dev.ktest
index 979122c..5fd884c 100755
--- a/tests/bcache/bcache_flash_dev.ktest
+++ b/tests/bcache/bcache_flash_dev.ktest
@@ -8,7 +8,7 @@ config-block-size 2k
 config-volume 1400M
 config-mem 512M
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_flash_dev_replication.ktest b/tests/bcache/bcache_flash_dev_replication.ktest
index 81e416e..9dc4665 100755
--- a/tests/bcache/bcache_flash_dev_replication.ktest
+++ b/tests/bcache/bcache_flash_dev_replication.ktest
@@ -10,7 +10,7 @@ config-meta-replicas 2
 config-data-replicas 2
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_flash_dev_small_buckets.ktest b/tests/bcache/bcache_flash_dev_small_buckets.ktest
index 8d49f06..1933f57 100755
--- a/tests/bcache/bcache_flash_dev_small_buckets.ktest
+++ b/tests/bcache/bcache_flash_dev_small_buckets.ktest
@@ -8,7 +8,7 @@ config-block-size 2k
 config-volume 1400M
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_many_devices.ktest b/tests/bcache/bcache_many_devices.ktest
index f8c729a..b0970f0 100755
--- a/tests/bcache/bcache_many_devices.ktest
+++ b/tests/bcache/bcache_many_devices.ktest
@@ -10,7 +10,7 @@ config-block-size 4k
 config-volume 2000M
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_passthrough.ktest b/tests/bcache/bcache_passthrough.ktest
index f9a71e7..942ac7f 100755
--- a/tests/bcache/bcache_passthrough.ktest
+++ b/tests/bcache/bcache_passthrough.ktest
@@ -7,7 +7,7 @@ config-bucket-size 64k
 config-block-size 4k
 config-mem 512M
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_reboot_fio.ktest b/tests/bcache/bcache_reboot_fio.ktest
index 674d9fb..dbd2e79 100755
--- a/tests/bcache/bcache_reboot_fio.ktest
+++ b/tests/bcache/bcache_reboot_fio.ktest
@@ -11,7 +11,7 @@ config-mem 512M
 config-cpus 1
 
 nr_iterations=$((($ktest_priority + 1) * 5))
-config-timeout $(($nr_iterations * 60))
+config-timeout $(($nr_iterations * 45 + $(stress_timeout)))
 
 main()
 {
diff --git a/tests/bcache/bcache_reboot_fs.ktest b/tests/bcache/bcache_reboot_fs.ktest
index 28aa8a9..7aad425 100755
--- a/tests/bcache/bcache_reboot_fs.ktest
+++ b/tests/bcache/bcache_reboot_fs.ktest
@@ -11,7 +11,7 @@ config-mem 512M
 config-cpus 1
 
 nr_iterations=$((($ktest_priority + 1) * 5))
-config-timeout $(($nr_iterations * 60))
+config-timeout $(($nr_iterations * 45 + $(stress_timeout)))
 
 main()
 {
diff --git a/tests/bcache/bcache_replication.ktest b/tests/bcache/bcache_replication.ktest
index 025c839..593f81c 100755
--- a/tests/bcache/bcache_replication.ktest
+++ b/tests/bcache/bcache_replication.ktest
@@ -11,7 +11,7 @@ config-mem 512M
 config-data-replicas 3
 config-meta-replicas 3
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_tier.ktest b/tests/bcache/bcache_tier.ktest
index 0e65b47..9b29eac 100755
--- a/tests/bcache/bcache_tier.ktest
+++ b/tests/bcache/bcache_tier.ktest
@@ -9,7 +9,7 @@ config-block-size 4k
 config-volume 1600M
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_tier_replication.ktest b/tests/bcache/bcache_tier_replication.ktest
index cd2c04e..5548fd5 100755
--- a/tests/bcache/bcache_tier_replication.ktest
+++ b/tests/bcache/bcache_tier_replication.ktest
@@ -11,7 +11,7 @@ config-mem 512M
 config-data-replicas 2
 config-meta-replicas 2
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcache_xfs.ktest b/tests/bcache/bcache_xfs.ktest
index 94f0e78..67bd331 100755
--- a/tests/bcache/bcache_xfs.ktest
+++ b/tests/bcache/bcache_xfs.ktest
@@ -10,7 +10,7 @@ config-block-size 4k
 config-writeback
 config-mem 512M
 
-config-timeout 1200
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/bcache/bcachefs.ktest b/tests/bcache/bcachefs.ktest
index a0d89d7..65b9929 100755
--- a/tests/bcache/bcachefs.ktest
+++ b/tests/bcache/bcachefs.ktest
@@ -8,7 +8,7 @@ config-bucket-size 64k
 config-block-size 2k
 config-mem 512M
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
diff --git a/tests/ext4.ktest b/tests/ext4.ktest
index c49cffe..fb9b4d5 100755
--- a/tests/ext4.ktest
+++ b/tests/ext4.ktest
@@ -5,11 +5,10 @@ require-lib ./test-libs.sh
 config-scratch-devs 2G
 config-mem 512M
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
-    SIZE=small
     FS=ext4
 
     #echo "file inode.c +p"		> /sys/kernel/debug/dynamic_debug/control
diff --git a/tests/test-libs.sh b/tests/test-libs.sh
index 02db8ed..efbdb60 100644
--- a/tests/test-libs.sh
+++ b/tests/test-libs.sh
@@ -169,11 +169,8 @@ stop_fs()
 
 # Bcache workloads
 #
-# The following variables must be set to use test_fio, test_bonnie or
-# test_dbench:
-# DEVICES - list of devices
-# SIZE - one of small, medium or large
-SIZE=small
+# The DEVICES variable must be set to a list of devices before any of the
+# below workloads are involed.
 
 test_wait()
 {
@@ -184,55 +181,47 @@ test_wait()
 
 test_bonnie()
 {
-    (
-	case $SIZE in
-	    small) loops=1 ;;
-	    medium) loops=10 ;;
-	    large) loops=100 ;;
-	    *) exit 1 ;;
-	esac
+    echo "=== start bonnie at $(date)"
+    loops=$((($ktest_priority + 1) * 5))
 
+    (
 	for dev in $DEVICES; do
 	    bonnie++ -x $loops -r 128 -u root -d /mnt/$dev &
 	done
 
 	test_wait
     )
+
+    echo "=== done bonnie at $(date)"
 }
 
 test_dbench()
 {
-    (
-	case $SIZE in
-	    small) duration=30 ;;
-	    medium) duration=300 ;;
-	    large) duration=100000 ;;
-	    *) exit 1 ;;
-	esac
+    echo "=== start dbench at $(date)"
+    duration=$((($ktest_priority + 1) * 30))
 
+    (
 	for dev in $DEVICES; do
 	    dbench -S -t $duration 2 -D /mnt/$dev &
 	done
 
 	test_wait
     )
+
+    echo "=== done dbench at $(date)"
 }
 
 test_fio()
 {
+    echo "=== start fio at $(date)"
+    loops=$(($ktest_priority + 1))
+
     (
 	# Our default working directory (/cdrom) is not writable,
 	# fio wants to write files when verify_dump is set, so
 	# change to a different directory.
 	cd $LOGDIR
 
-	case $SIZE in
-	    small) loops=1 ;;
-	    medium) loops=10 ;;
-	    large) loops=100 ;;
-	    *) exit 1 ;;
-	esac
-
 	for dev in $DEVICES; do
 	    fio --eta=always - <<-ZZ &
 		[global]
@@ -250,7 +239,7 @@ test_fio()
 		filename=$dev
 
 		[seqwrite]
-		loops=1
+		loops=$loops
 		blocksize_range=4k-128k
 		rw=write
 		verify=crc32c-intel
@@ -266,25 +255,24 @@ test_fio()
 
 	test_wait
     )
+
+    echo "=== done fio at $(date)"
 }
 
 test_fsx()
 {
+    echo "=== start fsx at $(date)"
+    numops=$((($ktest_priority + 1) * 300000))
+
     (
-	case $SIZE in
-	    small) numops=300000 ;;
-	    medium) numops=3000000 ;;
-	    large) numops=30000000 ;;
-	    *) exit 1 ;;
-	esac
-
-	echo $DEVICES
 	for dev in $DEVICES; do
 	    ltp-fsx -N $numops /mnt/$dev/foo
 	done
 
 	test_wait
     )
+
+    echo "=== done fsx at $(date)"
 }
 
 expect_sysfs()
@@ -402,6 +390,11 @@ test_stress()
     test_discard
 }
 
+stress_timeout()
+{
+    echo $((($ktest_priority + 3) * 300))
+}
+
 test_powerfail()
 {
     sleep 120
diff --git a/tests/xfs.ktest b/tests/xfs.ktest
index c9355a3..daf35fd 100755
--- a/tests/xfs.ktest
+++ b/tests/xfs.ktest
@@ -6,11 +6,10 @@ require-kernel-config XFS_FS
 config-scratch-devs 2G
 config-mem 512M
 
-config-timeout 600
+config-timeout $(stress_timeout)
 
 main()
 {
-    SIZE=small
     FS=xfs
 
     #echo "file inode.c +p"		> /sys/kernel/debug/dynamic_debug/control