Merge branch 'free-dump-options' of https://github.com/floatious/fio

[fio.git] / t / zbd / test-zbd-support

diff --git a/t/zbd/test-zbd-support b/t/zbd/test-zbd-support
index 033c2ebcf4a7de3728aa22a5dfc1a3a3fa23272f..be1296151930f46ea9694cdb9ba580ef60ba335a 100755 (executable)
--- a/t/zbd/test-zbd-support
+++ b/t/zbd/test-zbd-support
@@ -464,15 +464,20 @@ test13() {
 
 # Random write to conventional zones.
 test14() {
-    local size
+    local off size
 
+    if ! result=($(first_online_zone "$dev")); then
+       echo "Failed to determine first online zone"
+       exit 1
+    fi
+    off=${result[0]}
     prep_write
     size=$((16 * 2**20)) # 20 MB
     require_conv_zone_bytes "${size}" || return $SKIP_TESTCASE
 
     run_one_fio_job "$(ioengine "libaio")" --iodepth=64 --rw=randwrite --bs=16K \
                    --zonemode=zbd --zonesize="${zone_size}" --do_verify=1 \
-                   --verify=md5 --size=$size                              \
+                   --verify=md5 --offset=$off --size=$size\
                    >>"${logfile}.${test_number}" 2>&1 || return $?
     check_written $((size)) || return $?
     check_read $((size)) || return $?
@@ -529,17 +534,26 @@ test16() {
 
 # Random reads and writes in the last zone.
 test17() {
-    local io off read size written
+    local io off last read size written
 
     off=$(((disk_size / zone_size - 1) * zone_size))
     size=$((disk_size - off))
+    if ! last=($(last_online_zone "$dev")); then
+       echo "Failed to determine last online zone"
+       exit 1
+    fi
+    if [[ "$((last * 512))" -lt "$off" ]]; then
+       off=$((last * 512))
+       size=$zone_size
+    fi
     if [ -n "$is_zbd" ]; then
        reset_zone "$dev" $((off / 512)) || return $?
     fi
     prep_write
     run_one_fio_job "$(ioengine "libaio")" --iodepth=8 --rw=randrw --bs=4K \
                    --zonemode=zbd --zonesize="${zone_size}"            \
-                   --offset=$off --loops=2 --norandommap=1\
+                   --offset=$off --loops=2 --norandommap=1 \
+                   --size="$size"\
                    >>"${logfile}.${test_number}" 2>&1 || return $?
     written=$(fio_written <"${logfile}.${test_number}")
     read=$(fio_read <"${logfile}.${test_number}")
@@ -867,10 +881,17 @@ test38() {
 
 # Read one block from a block device.
 read_one_block() {
+    local off
     local bs
 
+    if ! result=($(first_online_zone "$dev")); then
+       echo "Failed to determine first online zone"
+       exit 1
+    fi
+    off=${result[0]}
     bs=$((logical_block_size))
-    run_one_fio_job --rw=read "$(ioengine "psync")" --bs=$bs --size=$bs "$@" 2>&1 |
+    run_one_fio_job --rw=read "$(ioengine "psync")" --offset=$off --bs=$bs \
+                   --size=$bs "$@" 2>&1 |
        tee -a "${logfile}.${test_number}"
 }
 
@@ -987,7 +1008,7 @@ test48() {
 
     { echo; echo "fio ${opts[*]}"; echo; } >>"${logfile}.${test_number}"
 
-    timeout -v -s KILL 45s \
+    timeout -v -s KILL 180s \
            "${dynamic_analyzer[@]}" "$fio" "${opts[@]}" \
            >> "${logfile}.${test_number}" 2>&1 || return $?
 }
@@ -1114,6 +1135,73 @@ test53() {
        return 1
 }
 
+# Test read/write mix with verify.
+test54() {
+       require_zbd || return $SKIP_TESTCASE
+       require_seq_zones 8 || return $SKIP_TESTCASE
+
+       run_fio --name=job --filename=${dev} "$(ioengine "libaio")" \
+               --time_based=1 --runtime=30s --continue_on_error=0 \
+               --offset=$((first_sequential_zone_sector * 512)) \
+               --size=$((8*zone_size)) --direct=1 --iodepth=1 \
+               --rw=randrw:2 --rwmixwrite=25 --bsrange=4k-${zone_size} \
+               --zonemode=zbd --zonesize=${zone_size} \
+               --verify=crc32c --do_verify=1 --verify_backlog=2 \
+               --experimental_verify=1 \
+               --alloc-size=65536 --random_generator=tausworthe64 \
+               ${job_var_opts[@]} --debug=zbd \
+               >> "${logfile}.${test_number}" 2>&1 || return $?
+}
+
+# test 'z' suffix parsing only
+test55() {
+       local bs
+       bs=$((logical_block_size))
+
+       require_zbd || return $SKIP_TESTCASE
+       # offset=1z + offset_increment=10z + size=2z
+       require_seq_zones 13 || return $SKIP_TESTCASE
+
+       run_fio --name=j                \
+               --filename=${dev}       \
+               --direct=1              \
+               "$(ioengine "psync")"   \
+               --zonemode=zbd          \
+               --zonesize=${zone_size} \
+               --rw=write              \
+               --bs=${bs}              \
+               --numjobs=2             \
+               --offset_increment=10z  \
+               --offset=1z             \
+               --size=2z               \
+               --io_size=3z            \
+               ${job_var_opts[@]} --debug=zbd \
+               >> "${logfile}.${test_number}" 2>&1 || return $?
+}
+
+# test 'z' suffix parsing only
+test56() {
+       local bs
+       bs=$((logical_block_size))
+
+       require_regular_block_dev || return $SKIP_TESTCASE
+       require_seq_zones 10 || return $SKIP_TESTCASE
+
+       run_fio --name=j                \
+               --filename=${dev}       \
+               --direct=1              \
+               "$(ioengine "psync")"   \
+               --zonemode=strided      \
+               --zonesize=${zone_size} \
+               --rw=write              \
+               --bs=${bs}              \
+               --size=10z              \
+               --zoneskip=2z           \
+               ${job_var_opts[@]} --debug=zbd \
+               >> "${logfile}.${test_number}" 2>&1 || return $?
+}
+
+SECONDS=0
 tests=()
 dynamic_analyzer=()
 reset_all_zones=
@@ -1138,6 +1226,7 @@ while [ "${1#-}" != "$1" ]; do
     -q) quit_on_err=1; shift;;
     -z) zbd_debug=1; shift;;
     --) shift; break;;
+     *) usage; exit 1;;
   esac
 done
 
@@ -1307,4 +1396,5 @@ fi
 if [ $failed -gt 0 ]; then
     echo " $failed tests failed"
 fi
+echo "Run time: $(TZ=UTC0 printf "%(%H:%M:%S)T\n" $(( SECONDS )) )"
 exit $rc