]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Revert "qa/tasks/radosbench: only set object size if != block size"
authorJosh Durgin <jdurgin@redhat.com>
Mon, 8 Jun 2020 18:27:50 +0000 (11:27 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 9 Jun 2020 20:13:41 +0000 (13:13 -0700)
This reverts commit fb991fa5f62c4aaa6c564a6d15aeee4bfaa33b39.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
qa/tasks/radosbench.py - extra context from -t, trivial resolution

qa/tasks/radosbench.py

index 9e6c4eda2f1d3964e73a890d41e6bb36663654e8..afee16a932242d8be60237ed63f71595735a143d 100644 (file)
@@ -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(