Merge PR #32405 into master

* refs/pull/32405/head:
	qa/workunits/rados/test_large_omap_detection: py3-ify

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2019-12-25 09:18:58 -06:00
commit 31e6b807f9

View File

@ -33,20 +33,20 @@ def init():
print("\nCluster ID: " + cluster.get_fsid())
cluster.create_pool('large-omap-test-pool')
ioctx = cluster.open_ioctx('large-omap-test-pool')
ioctx.write_full('large-omap-test-object1', "Lorem ipsum")
ioctx.write_full('large-omap-test-object1', b"Lorem ipsum")
op = ioctx.create_write_op()
keys = []
values = []
for x in range(20001):
keys.append(str(x))
values.append("X")
values.append(b"X")
ioctx.set_omap(op, tuple(keys), tuple(values))
ioctx.operate_write_op(op, 'large-omap-test-object1', 0)
ioctx.release_write_op(op)
ioctx.write_full('large-omap-test-object2', "Lorem ipsum dolor")
ioctx.write_full('large-omap-test-object2', b"Lorem ipsum dolor")
op = ioctx.create_write_op()
buffer = ("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do "
@ -61,7 +61,7 @@ def init():
values = []
for x in range(20000):
keys.append(str(x))
values.append(buffer)
values.append(buffer.encode())
ioctx.set_omap(op, tuple(keys), tuple(values))
ioctx.operate_write_op(op, 'large-omap-test-object2', 0)
@ -115,7 +115,7 @@ def check_health_output():
RETRIES += 1
output = subprocess.check_output(["ceph", "health", "detail"])
for line in output.splitlines():
result += int(line.find('2 large omap objects') != -1)
result += int(line.find(b'2 large omap objects') != -1)
time.sleep(10)
if result != 2: