From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jan 2020 23:27:30 +0000 (-0600)
Subject: qa/tasks/radosbench: only set object size if != block size
X-Git-Tag: v15.1.0~57^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb991fa5f62c4aaa6c564a6d15aeee4bfaa33b39;p=ceph.git

qa/tasks/radosbench: only set object size if != block size

This is mostly pointless, except that the -O option for objects size
used to be -o for pre-octopus, so passing -O breaks the upgrade tests.
Fortunately, the upgrades use the defaults, so we can just skate by here.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/radosbench.py b/qa/tasks/radosbench.py
index dfe3e6153395..90e4795ef1cd 100644
--- a/qa/tasks/radosbench.py
+++ b/qa/tasks/radosbench.py
@@ -82,12 +82,12 @@ def task(ctx, config):
             else:
                 pool = manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
 
+        size = ['-b', str(config.get('size', 65536))]
         osize = config.get('objectsize', 65536)
-        if osize == 0:
+        if osize == 0 or osize == size:
             objectsize = []
         else:
             objectsize = ['-O', str(osize)]
-        size = ['-b', str(config.get('size', 65536))]
         # If doing a reading run then populate data
         if runtype != "write":
             proc = remote.run(