From ff43a214348179a32896e886675d7b45859e5a9c Mon Sep 17 00:00:00 2001
From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 8 Jun 2020 11:20:16 -0700
Subject: [PATCH] Revert "qa/tasks/radosbench: fix usage of -O"

This reverts commit da19fd14dbe8bdb62ce376d9df7bf5578f169b9c.

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

Conflicts:
	qa/tasks/radosbench.py - concurrency arg added in context, trival resolution

(cherry picked from commit 5a8c7f7d7f28a697611bab4fb816771b45cecd3e)
---
 qa/tasks/radosbench.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/qa/tasks/radosbench.py b/qa/tasks/radosbench.py
index 90b21a5d88b26..9e6c4eda2f1d3 100644
--- a/qa/tasks/radosbench.py
+++ b/qa/tasks/radosbench.py
@@ -83,15 +83,13 @@ def task(ctx, config):
             else:
                 pool = manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
 
-        size = config.get('size', 65536)
         concurrency = config.get('concurrency', 16)
+        size = ['-b', str(config.get('size', 65536))]
         osize = config.get('objectsize', 65536)
-        sizeargs = ['-b', str(size)]
-        if osize != 0 and osize != size:
-            # only use -O if this varies from size. kludgey workaround the
-            # fact that -O was -o in older releases.
-            sizeargs.extend(['-O', str(osize)])
-
+        if osize == 0 or osize == size:
+            objectsize = []
+        else:
+            objectsize = ['-O', str(osize)]
         # If doing a reading run then populate data
         if runtype != "write":
             proc = remote.run(
@@ -102,9 +100,9 @@ def task(ctx, config):
                               '{tdir}/archive/coverage',
                               'rados',
                               '--no-log-to-stderr',
-                              '--name', role]
-                              + sizeargs +
-                              ['-t', str(concurrency)] +
+                              '--name', role] +
+                              ['-t', str(concurrency)]
+                              + size + objectsize +
                               ['-p' , pool,
                           'bench', str(60), "write", "--no-cleanup"
                           ]).format(tdir=testdir),
@@ -112,7 +110,8 @@ def task(ctx, config):
             logger=log.getChild('radosbench.{id}'.format(id=id_)),
             wait=True
             )
-            sizeargs = []
+            size = []
+            objectsize = []
 
         proc = remote.run(
             args=[
@@ -123,7 +122,7 @@ def task(ctx, config):
                           'rados',
 			  '--no-log-to-stderr',
                           '--name', role]
-                          + sizeargs +
+                          + size + objectsize +
                           ['-p' , pool,
                           'bench', str(config.get('time', 360)), runtype,
                           ] + write_to_omap + cleanup).format(tdir=testdir),
-- 
2.39.5