Merge pull request #26168 from shyukri/qa-rbd-replace-bench-write

qa: rbd/workunits : Replace "rbd bench-write" with "rbd bench --io-type write"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Jason Dillaman 2019-01-30 07:51:55 -05:00 committed by GitHub
commit 347eac67ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -14,14 +14,14 @@ function cleanup() {
cleanup
rbd create foo --size 1000
rbd bench-write foo --io-size 4096 --io-threads 5 --io-total 4096000 --io-pattern rand
rbd bench --io-type write foo --io-size 4096 --io-threads 5 --io-total 4096000 --io-pattern rand
#rbd cp foo foo.copy
rbd create foo.copy --size 1000
rbd export-diff foo - | rbd import-diff - foo.copy
rbd snap create foo --snap=two
rbd bench-write foo --io-size 4096 --io-threads 5 --io-total 4096000 --io-pattern rand
rbd bench --io-type write foo --io-size 4096 --io-threads 5 --io-total 4096000 --io-pattern rand
rbd snap create foo --snap=three
rbd snap create foo.copy --snap=two

View File

@ -25,7 +25,7 @@ trap cleanup EXIT
# start from a clone
rbd create $parent --size $size --image-format 2 --stripe-count 8 --stripe-unit 65536
rbd bench-write $parent --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand
rbd bench --io-type write $parent --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand
rbd snap create $parent --snap parent
rbd snap protect $parent --snap parent
rbd clone $parent@parent $src --stripe-count 4 --stripe-unit 262144
@ -35,7 +35,7 @@ rbd create $dst --size $size --image-format 2 --order 19
for s in `seq 1 $max`; do
rbd snap create $src --snap=snap$s
rbd export-diff $src@snap$s - $lastsnap | rbd import-diff - $dst &
rbd bench-write $src --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand &
rbd bench --io-type write $src --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand &
wait
lastsnap="--from-snap snap$s"
done

View File

@ -70,7 +70,7 @@ test_rbd_journal()
local count=10
save_commit_position ${journal}
rbd bench-write ${image} --io-size 4096 --io-threads 1 \
rbd bench --io-type write ${image} --io-size 4096 --io-threads 1 \
--io-total $((4096 * count)) --io-pattern seq
rbd journal status --image ${image} | fgrep "tid=$((count - 1))"
restore_commit_position ${journal}