mirror of
https://github.com/ceph/ceph
synced 2025-01-01 08:32:24 +00:00
qa/tasks/ceph_objectstore_tool: get rid of cStringIO for py3
Signed-off-by: Kefu Chai <kchai@redhat.com> Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
This commit is contained in:
Kyr Shatskyy
Kefu Chai
parent
b6eefbb028
commit
b502bc17d1
@ -1,18 +1,23 @@
|
||||
"""
|
||||
ceph_objectstore_tool - Simple test of ceph-objectstore-tool utility
|
||||
"""
|
||||
from cStringIO import StringIO
|
||||
from io import BytesIO
|
||||
|
||||
import contextlib
|
||||
import logging
|
||||
import ceph_manager
|
||||
from teuthology import misc as teuthology
|
||||
import time
|
||||
import os
|
||||
import six
|
||||
import string
|
||||
from teuthology.orchestra import run
|
||||
import sys
|
||||
import tempfile
|
||||
import json
|
||||
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
from util.rados import (rados, create_replicated_pool, create_ec_pool)
|
||||
# from util.rados import (rados, create_ec_pool,
|
||||
# create_replicated_pool,
|
||||
@ -289,14 +294,9 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
log.info("process osd.{id} on {remote}".
|
||||
format(id=osdid, remote=remote))
|
||||
cmd = (prefix + "--op list").format(id=osdid)
|
||||
proc = remote.run(args=cmd.split(), check_status=False,
|
||||
stdout=StringIO())
|
||||
if proc.exitstatus != 0:
|
||||
log.error("Bad exit status {ret} from --op list request".
|
||||
format(ret=proc.exitstatus))
|
||||
ERRORS += 1
|
||||
else:
|
||||
for pgline in proc.stdout.getvalue().splitlines():
|
||||
try:
|
||||
lines = remote.sh(cmd, check_status=False).splitlines()
|
||||
for pgline in lines:
|
||||
if not pgline:
|
||||
continue
|
||||
(pg, obj) = json.loads(pgline)
|
||||
@ -306,6 +306,10 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
objsinpg.setdefault(pg, []).append(name)
|
||||
db[name].setdefault("pg2json",
|
||||
{})[pg] = json.dumps(obj)
|
||||
except CommandFailedError as e:
|
||||
log.error("Bad exit status {ret} from --op list request".
|
||||
format(ret=e.exitstatus))
|
||||
ERRORS += 1
|
||||
|
||||
log.info(db)
|
||||
log.info(pgswithobjects)
|
||||
@ -376,20 +380,18 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
format(id=osdid, pg=pg).split())
|
||||
cmd.append(run.Raw("'{json}'".format(json=JSON)))
|
||||
cmd += "get-bytes -".split()
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
log.error("get-bytes after "
|
||||
"set-bytes ret={ret}".
|
||||
format(ret=proc.exitstatus))
|
||||
ERRORS += 1
|
||||
else:
|
||||
if data != proc.stdout.getvalue():
|
||||
try:
|
||||
output = remote.sh(cmd, wait=True)
|
||||
if data != output:
|
||||
log.error("Data inconsistent after "
|
||||
"set-bytes, got:")
|
||||
log.error(proc.stdout.getvalue())
|
||||
log.error(output)
|
||||
ERRORS += 1
|
||||
except CommandFailedError as e:
|
||||
log.error("get-bytes after "
|
||||
"set-bytes ret={ret}".
|
||||
format(ret=e.exitstatus))
|
||||
ERRORS += 1
|
||||
|
||||
cmd = ((prefix + "--pgid {pg}").
|
||||
format(id=osdid, pg=pg).split())
|
||||
@ -425,15 +427,13 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
format(id=osdid, pg=pg).split())
|
||||
cmd.append(run.Raw("'{json}'".format(json=JSON)))
|
||||
cmd += ["list-attrs"]
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO(), stderr=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
keys = remote.sh(cmd, wait=True, stderr=BytesIO()).split()
|
||||
except CommandFailedError as e:
|
||||
log.error("Bad exit status {ret}".
|
||||
format(ret=proc.exitstatus))
|
||||
format(ret=e.exitstatus))
|
||||
ERRORS += 1
|
||||
continue
|
||||
keys = proc.stdout.getvalue().split()
|
||||
values = dict(db[basename]["xattr"])
|
||||
|
||||
for key in keys:
|
||||
@ -453,15 +453,13 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
cmd.append(run.Raw("'{json}'".format(json=JSON)))
|
||||
cmd += ("get-attr {key}".
|
||||
format(key="_" + key).split())
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
val = remote.sh(cmd, wait=True)
|
||||
except CommandFailedError as e:
|
||||
log.error("get-attr failed with {ret}".
|
||||
format(ret=proc.exitstatus))
|
||||
format(ret=e.exitstatus))
|
||||
ERRORS += 1
|
||||
continue
|
||||
val = proc.stdout.getvalue()
|
||||
if exp != val:
|
||||
log.error("For key {key} got value {got} "
|
||||
"instead of {expected}".
|
||||
@ -483,14 +481,16 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
proc = remote.run(args=['bash', '-e', '-x',
|
||||
'-c', cmd],
|
||||
check_status=False,
|
||||
stdout=StringIO(),
|
||||
stderr=StringIO())
|
||||
stdout=BytesIO(),
|
||||
stderr=BytesIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
log.error("failed with " +
|
||||
str(proc.exitstatus))
|
||||
log.error(proc.stdout.getvalue() + " " +
|
||||
proc.stderr.getvalue())
|
||||
log.error(" ".join([
|
||||
six.ensure_str(proc.stdout.getvalue()),
|
||||
six.ensure_str(proc.stderr.getvalue()),
|
||||
]))
|
||||
ERRORS += 1
|
||||
|
||||
if len(values) != 0:
|
||||
@ -509,15 +509,13 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
for pg in pgs[osdid]:
|
||||
cmd = ((prefix + "--op info --pgid {pg}").
|
||||
format(id=osdid, pg=pg).split())
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
info = remote.sh(cmd, wait=True)
|
||||
except CommandFailedError as e:
|
||||
log.error("Failure of --op info command with {ret}".
|
||||
format(proc.exitstatus))
|
||||
format(e.exitstatus))
|
||||
ERRORS += 1
|
||||
continue
|
||||
info = proc.stdout.getvalue()
|
||||
if not str(pg) in info:
|
||||
log.error("Bad data from info: {info}".format(info=info))
|
||||
ERRORS += 1
|
||||
@ -534,17 +532,16 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
for pg in pgs[osdid]:
|
||||
cmd = ((prefix + "--op log --pgid {pg}").
|
||||
format(id=osdid, pg=pg).split())
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
output = remote.sh(cmd, wait=True)
|
||||
except CommandFailedError as e:
|
||||
log.error("Getting log failed for pg {pg} "
|
||||
"from osd.{id} with {ret}".
|
||||
format(pg=pg, id=osdid, ret=proc.exitstatus))
|
||||
format(pg=pg, id=osdid, ret=e.exitstatus))
|
||||
ERRORS += 1
|
||||
continue
|
||||
HASOBJ = pg in pgswithobjects
|
||||
MODOBJ = "modify" in proc.stdout.getvalue()
|
||||
MODOBJ = "modify" in output
|
||||
if HASOBJ != MODOBJ:
|
||||
log.error("Bad log for pg {pg} from osd.{id}".
|
||||
format(pg=pg, id=osdid))
|
||||
@ -569,13 +566,12 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
|
||||
cmd = ((prefix + "--op export --pgid {pg} --file {file}").
|
||||
format(id=osdid, pg=pg, file=fpath))
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
remote.sh(cmd, wait=True)
|
||||
except CommandFailedError as e:
|
||||
log.error("Exporting failed for pg {pg} "
|
||||
"on osd.{id} with {ret}".
|
||||
format(pg=pg, id=osdid, ret=proc.exitstatus))
|
||||
format(pg=pg, id=osdid, ret=e.exitstatus))
|
||||
EXP_ERRORS += 1
|
||||
|
||||
ERRORS += EXP_ERRORS
|
||||
@ -593,13 +589,12 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
for pg in pgs[osdid]:
|
||||
cmd = ((prefix + "--force --op remove --pgid {pg}").
|
||||
format(pg=pg, id=osdid))
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
remote.sh(cmd, wait=True)
|
||||
except CommandFailedError as e:
|
||||
log.error("Removing failed for pg {pg} "
|
||||
"on osd.{id} with {ret}".
|
||||
format(pg=pg, id=osdid, ret=proc.exitstatus))
|
||||
format(pg=pg, id=osdid, ret=e.exitstatus))
|
||||
RM_ERRORS += 1
|
||||
|
||||
ERRORS += RM_ERRORS
|
||||
@ -622,12 +617,11 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
|
||||
|
||||
cmd = ((prefix + "--op import --file {file}").
|
||||
format(id=osdid, file=fpath))
|
||||
proc = remote.run(args=cmd, check_status=False,
|
||||
stdout=StringIO())
|
||||
proc.wait()
|
||||
if proc.exitstatus != 0:
|
||||
try:
|
||||
remote.sh(cmd, wait=True)
|
||||
except CommandFailedError as e:
|
||||
log.error("Import failed from {file} with {ret}".
|
||||
format(file=fpath, ret=proc.exitstatus))
|
||||
format(file=fpath, ret=e.exitstatus))
|
||||
IMP_ERRORS += 1
|
||||
else:
|
||||
log.warning("SKIPPING IMPORT TESTS DUE TO PREVIOUS FAILURES")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user