From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 8 Jun 2020 18:27:50 +0000 (-0700)
Subject: Revert "qa/tasks/radosbench: only set object size if != block size"
X-Git-Tag: v16.1.0~2084^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a78781d82e55bb01a8a1fb42eb072b944e336973;p=ceph.git

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

This reverts commit fb991fa5f62c4aaa6c564a6d15aeee4bfaa33b39.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	qa/tasks/radosbench.py - extra context from -t, trivial resolution
---

diff --git a/qa/tasks/radosbench.py b/qa/tasks/radosbench.py
index 9e6c4eda2f1d..afee16a93224 100644
--- a/qa/tasks/radosbench.py
+++ b/qa/tasks/radosbench.py
@@ -84,12 +84,12 @@ def task(ctx, config):
                 pool = manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
 
         concurrency = config.get('concurrency', 16)
-        size = ['-b', str(config.get('size', 65536))]
         osize = config.get('objectsize', 65536)
-        if osize == 0 or osize == size:
+        if osize == 0:
             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(