From 28f0749eae0543181edf340bb542048525f5ff97 Mon Sep 17 00:00:00 2001 From: Shyukri Shyukriev Date: Mon, 28 Jan 2019 14:24:54 +0200 Subject: [PATCH] qa:rbd/workunits : Replace `rbd bench-write` with `rbd bench --io-type write` Signed-off-by: Shyukri Shyukriev --- qa/workunits/rbd/diff.sh | 4 ++-- qa/workunits/rbd/diff_continuous.sh | 4 ++-- qa/workunits/rbd/journal.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qa/workunits/rbd/diff.sh b/qa/workunits/rbd/diff.sh index 73a7290a18b02..fbd6e06426d1a 100755 --- a/qa/workunits/rbd/diff.sh +++ b/qa/workunits/rbd/diff.sh @@ -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 diff --git a/qa/workunits/rbd/diff_continuous.sh b/qa/workunits/rbd/diff_continuous.sh index d9cd8efdad0a2..b8f7e8b7e1375 100755 --- a/qa/workunits/rbd/diff_continuous.sh +++ b/qa/workunits/rbd/diff_continuous.sh @@ -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 diff --git a/qa/workunits/rbd/journal.sh b/qa/workunits/rbd/journal.sh index d35ea189a8404..ba89e75c92641 100755 --- a/qa/workunits/rbd/journal.sh +++ b/qa/workunits/rbd/journal.sh @@ -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} -- 2.39.5