Recent changes (master)
The following changes since commit 152529ae26d1167779138b6cd30d4de10623da1b:
gettime: slightly improve CPU clock calibration (2018-09-27 17:38:21 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 91d2513127442c4946dc99978870c4dc4f58427d:
zbd: Avoid duplicating the code for calculating the number of sectors with data (2018-09-29 15:16:26 -0600)
----------------------------------------------------------------
Bart Van Assche (6):
t/zbd/functions: Make fio_reset_count() return 0 if no resets occurred t/zbd/test-zbd-support: Ensure that an assertion failure causes this test to fail t/zbd/test-zbd-support: Set fio aux path and forbid file creation t/zbd/test-zbd-support: Report a test summary when finished
zbd: Restore zbd_check_swd()
zbd: Avoid duplicating the code for calculating the number of sectors with data
Damien Le Moal (1):
zbd: Fix incorrect comments
t/zbd/functions | 5 +++- t/zbd/test-zbd-support | 17 +++++++++--- zbd.c | 75 ++++++++++++++++++++++++++++++++++++++++++-------- zbd.h | 4 +-- 4 files changed, 82 insertions(+), 19 deletions(-)
---
Diff of recent changes:
t/zbd/functions +4 -1
@@ -102,5 +102,8 @@ fio_written() { } fio_reset_count() { - sed -n 's/^.*write:[^;]*; \([0-9]*\) zone resets$/\1/p' + local count + + count=$(sed -n 's/^.*write:[^;]*; \([0-9]*\) zone resets$/\1/p') + echo "${count:-0}" }
t/zbd/test-zbd-support +13 -4
@@ -81,13 +81,14 @@ is_scsi_device() { } run_fio() { - local fio + local fio opts fio=$(dirname "$0")/../../fio - { echo; echo "fio $*"; echo; } >>"${logfile}.${test_number}" + opts=("--aux-path=/tmp" "--allow_file_create=0" "$@") + { echo; echo "fio ${opts[*]}"; echo; } >>"${logfile}.${test_number}" - "${dynamic_analyzer[@]}" "$fio" "$@" + "${dynamic_analyzer[@]}" "$fio" "${opts[@]}" } run_one_fio_job() {
@@ -113,7 +114,7 @@ run_fio_on_seq() { # Check whether buffered writes are refused. test1() { run_fio --name=job1 --filename="$dev" --rw=write --direct=0 --bs=4K \ - --size="${zone_size}" \ + --size="${zone_size}" --thread=1 \ --zonemode=zbd --zonesize="${zone_size}" 2>&1 | tee -a "${logfile}.${test_number}" | grep -q 'Using direct I/O is mandatory for writing to ZBD drives'
@@ -800,18 +801,26 @@ fi logfile=$0.log +passed=0 +failed=0 rc=0 for test_number in "${tests[@]}"; do rm -f "${logfile}.${test_number}" echo -n "Running test $test_number ... " if eval "test$test_number"; then status="PASS" + ((passed++)) else status="FAIL" + ((failed++)) rc=1 fi echo "$status" echo "$status" >> "${logfile}.${test_number}" done +echo "$passed tests passed" +if [ $failed -gt 0 ]; then + echo " and $failed tests failed" +fi exit $rc
zbd.c +63 -12
104 lines not on this page · raw message
zbd.h +2 -2
@@ -31,8 +31,8 @@ enum io_u_action {/** * struct fio_zone_info - information about a single ZBD zone -* @start: zone start in 512 byte units -* @wp: zone write pointer location in 512 byte units +* @start: zone start location (bytes) +* @wp: zone write pointer location (bytes) * @verify_block: number of blocks that have been verified for this zone * @mutex: protects the modifiable members in this structure * @type: zone type (BLK_ZONE_TYPE_*)