From: Joao Eduardo Luis Date: Wed, 25 Jun 2014 20:25:29 +0000 (+0100) Subject: qa/workunits: cephtool: fix 'osd bench' test X-Git-Tag: v0.80.6~103^2~2^2~46 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f911d45632fd23c4124bf6b29287ece473d33b4;p=ceph.git qa/workunits: cephtool: fix 'osd bench' test Commit 7dc93a9651f602d9c46311524fc6b54c2f1ac595 fixed an incorrect behavior with the OSD's 'osd bench' value hard-caps. The test wasn't appropriately modified unfortunately. Signed-off-by: Joao Eduardo Luis (cherry picked from commit 48e38ac6323f4a0e06b0dedd37ecd10dc339b1e3) --- diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index faf20db9b71a..866ec2214e47 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -717,7 +717,7 @@ function test_osd_bench() # we assume 1MB as a large bs; anything lower is a small bs # for a 4096 bytes bs, for 10 seconds, we are limited by IOPS - # max count: 409600 + # max count: 409600 (bytes) # more than max count must not be allowed expect_false ceph tell osd.0 bench 409601 4096 @@ -725,13 +725,14 @@ function test_osd_bench() ceph tell osd.0 bench 409600 4096 # for a large bs, we are limited by throughput. - # for a 2MB block size for 10 seconds, out max count is 50 - # max count: 50 + # for a 2MB block size for 10 seconds, assuming 10MB/s throughput, + # the max count will be (10MB * 10s) = 100MB + # max count: 104857600 (bytes) # more than max count must not be allowed - expect_false ceph tell osd.0 bench 51 2097152 - # but 50 must succeed - ceph tell osd.0 bench 50 2097152 + expect_false ceph tell osd.0 bench 104857601 2097152 + # up to max count must be allowed + ceph tell osd.0 bench 104857600 2097152 }