]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_objectstore_tool: fix pep8 errors
authorLoic Dachary <ldachary@redhat.com>
Thu, 18 Dec 2014 22:50:12 +0000 (23:50 +0100)
committerDavid Zafman <dzafman@redhat.com>
Wed, 4 Mar 2015 00:09:52 +0000 (16:09 -0800)
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 75287f0868c12c462f6758fcb11c60a74c24ced5)

tasks/ceph_objectstore_tool.py

index 602f5e2b0c6e79edabc380cdecfbd7630af6e895..3b899de33b8a03377970d47fec107c1f0febb7dd 100644 (file)
@@ -26,7 +26,8 @@ FSPATH = "/var/lib/ceph/osd/ceph-{id}"
 JPATH = "/var/lib/ceph/osd/ceph-{id}/journal"
 
 
-def cod_setup_local_data(log, ctx, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT):
+def cod_setup_local_data(log, ctx, NUM_OBJECTS, DATADIR,
+                         BASE_NAME, DATALINECOUNT):
     objects = range(1, NUM_OBJECTS + 1)
     for i in objects:
         NAME = BASE_NAME + "{num}".format(num=i)
@@ -40,14 +41,15 @@ def cod_setup_local_data(log, ctx, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUN
         fd.close()
 
 
-def cod_setup_remote_data(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT):
+def cod_setup_remote_data(log, ctx, remote, NUM_OBJECTS, DATADIR,
+                          BASE_NAME, DATALINECOUNT):
 
     objects = range(1, NUM_OBJECTS + 1)
     for i in objects:
         NAME = BASE_NAME + "{num}".format(num=i)
         DDNAME = os.path.join(DATADIR, NAME)
 
-        remote.run(args=['rm', '-f', DDNAME ])
+        remote.run(args=['rm', '-f', DDNAME])
 
         dataline = range(DATALINECOUNT)
         data = "This is the data for " + NAME + "\n"
@@ -57,7 +59,8 @@ def cod_setup_remote_data(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DAT
         teuthology.write_file(remote, DDNAME, DATA)
 
 
-def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT, POOL, db, ec):
+def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR,
+              BASE_NAME, DATALINECOUNT, POOL, db, ec):
     ERRORS = 0
     log.info("Creating {objs} objects in pool".format(objs=NUM_OBJECTS))
 
@@ -66,11 +69,13 @@ def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT,
         NAME = BASE_NAME + "{num}".format(num=i)
         DDNAME = os.path.join(DATADIR, NAME)
 
-        proc = rados(ctx, remote, ['-p', POOL, 'put', NAME, DDNAME], wait=False)
+        proc = rados(ctx, remote, ['-p', POOL, 'put', NAME, DDNAME],
+                     wait=False)
         # proc = remote.run(args=['rados', '-p', POOL, 'put', NAME, DDNAME])
         ret = proc.wait()
         if ret != 0:
-            log.critical("Rados put failed with status {ret}".format(ret=proc.exitstatus))
+            log.critical("Rados put failed with status {ret}".
+                         format(ret=proc.exitstatus))
             sys.exit(1)
 
         db[NAME] = {}
@@ -82,7 +87,8 @@ def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT,
                 continue
             mykey = "key{i}-{k}".format(i=i, k=k)
             myval = "val{i}-{k}".format(i=i, k=k)
-            proc = remote.run(args=['rados', '-p', POOL, 'setxattr', NAME, mykey, myval])
+            proc = remote.run(args=['rados', '-p', POOL, 'setxattr',
+                                    NAME, mykey, myval])
             ret = proc.wait()
             if ret != 0:
                 log.error("setxattr failed with {ret}".format(ret=ret))
@@ -96,7 +102,8 @@ def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT,
         # Create omap header in all objects but REPobject1
         if i != 1:
             myhdr = "hdr{i}".format(i=i)
-            proc = remote.run(args=['rados', '-p', POOL, 'setomapheader', NAME, myhdr])
+            proc = remote.run(args=['rados', '-p', POOL, 'setomapheader',
+                                    NAME, myhdr])
             ret = proc.wait()
             if ret != 0:
                 log.critical("setomapheader failed with {ret}".format(ret=ret))
@@ -109,7 +116,8 @@ def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT,
                 continue
             mykey = "okey{i}-{k}".format(i=i, k=k)
             myval = "oval{i}-{k}".format(i=i, k=k)
-            proc = remote.run(args=['rados', '-p', POOL, 'setomapval', NAME, mykey, myval])
+            proc = remote.run(args=['rados', '-p', POOL, 'setomapval',
+                                    NAME, mykey, myval])
             ret = proc.wait()
             if ret != 0:
                 log.critical("setomapval failed with {ret}".format(ret=ret))
@@ -175,9 +183,11 @@ def task(ctx, config):
         )
     ctx.manager = manager
 
-    while len(manager.get_osd_status()['up']) != len(manager.get_osd_status()['raw']):
+    while (len(manager.get_osd_status()['up']) !=
+           len(manager.get_osd_status()['raw'])):
         time.sleep(10)
-    while len(manager.get_osd_status()['in']) != len(manager.get_osd_status()['up']):
+    while (len(manager.get_osd_status()['in']) !=
+           len(manager.get_osd_status()['up'])):
         time.sleep(10)
     manager.raw_cluster_cmd('osd', 'set', 'noout')
     manager.raw_cluster_cmd('osd', 'set', 'nodown')
@@ -195,7 +205,8 @@ def task(ctx, config):
     EC_POOL = "ec_pool"
     EC_NAME = "ECobject"
     create_ec_pool(cli_remote, EC_POOL, 'default', PGNUM)
-    ERRORS += test_objectstore(ctx, config, cli_remote, EC_POOL, EC_NAME, ec=True)
+    ERRORS += test_objectstore(ctx, config, cli_remote,
+                               EC_POOL, EC_NAME, ec=True)
 
     if ERRORS == 0:
         log.info("TEST PASSED")
@@ -231,15 +242,18 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
 
     LOCALDIR = tempfile.mkdtemp("cod")
 
-    cod_setup_local_data(log, ctx, NUM_OBJECTS, LOCALDIR, REP_NAME, DATALINECOUNT)
+    cod_setup_local_data(log, ctx, NUM_OBJECTS, LOCALDIR,
+                         REP_NAME, DATALINECOUNT)
     allremote = []
     allremote.append(cli_remote)
     allremote += osds.remotes.keys()
     allremote = list(set(allremote))
     for remote in allremote:
-        cod_setup_remote_data(log, ctx, remote, NUM_OBJECTS, DATADIR, REP_NAME, DATALINECOUNT)
+        cod_setup_remote_data(log, ctx, remote, NUM_OBJECTS, DATADIR,
+                              REP_NAME, DATALINECOUNT)
 
-    ERRORS += cod_setup(log, ctx, cli_remote, NUM_OBJECTS, DATADIR, REP_NAME, DATALINECOUNT, REP_POOL, db, ec)
+    ERRORS += cod_setup(log, ctx, cli_remote, NUM_OBJECTS, DATADIR,
+                        REP_NAME, DATALINECOUNT, REP_POOL, db, ec)
 
     pgs = {}
     for stats in manager.get_pg_stats():
@@ -251,10 +265,13 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
         elif pool_dump["type"] == ceph_manager.CephManager.ERASURE_CODED_POOL:
             shard = 0
             for osd in stats["acting"]:
-                pgs.setdefault(osd, []).append("{pgid}s{shard}".format(pgid=stats["pgid"], shard=shard))
+                pgs.setdefault(osd, []).append("{pgid}s{shard}".
+                                               format(pgid=stats["pgid"],
+                                                      shard=shard))
                 shard += 1
         else:
-            raise Exception("{pool} has an unexpected type {type}".format(pool=REP_POOL, type=pool_dump["type"]))
+            raise Exception("{pool} has an unexpected type {type}".
+                            format(pool=REP_POOL, type=pool_dump["type"]))
 
     log.info(pgs)
     log.info(db)
@@ -268,7 +285,9 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
 
     # Test --op list and generate json for all objects
     log.info("Test --op list by generating json for all objects")
-    prefix = "sudo ceph-objectstore-tool --data-path {fpath} --journal-path {jpath} ".format(fpath=FSPATH, jpath=JPATH)
+    prefix = ("sudo ceph-objectstore-tool "
+              "--data-path {fpath} "
+              "--journal-path {jpath} ").format(fpath=FSPATH, jpath=JPATH)
     for remote in osds.remotes.iterkeys():
         log.debug(remote)
         log.debug(osds.remotes[remote])
@@ -276,11 +295,14 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
             if string.find(role, "osd.") != 0:
                 continue
             osdid = int(role.split('.')[1])
-            log.info("process osd.{id} on {remote}".format(id=osdid, remote=remote))
+            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())
+            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))
+                log.error("Bad exit status {ret} from --op list request".
+                          format(ret=proc.exitstatus))
                 ERRORS += 1
             else:
                 for pgline in proc.stdout.getvalue().splitlines():
@@ -316,16 +338,21 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
 
                     for pg, JSON in db[basename]["pg2json"].iteritems():
                         if pg in pgs[osdid]:
-                            cmd = (prefix + "--pgid {pg}").format(id=osdid, pg=pg).split()
+                            cmd = ((prefix + "--pgid {pg}").
+                                   format(id=osdid, pg=pg).split())
                             cmd.append(run.Raw("'{json}'".format(json=JSON)))
-                            cmd += "get-bytes {fname}".format(fname=GETNAME).split()
+                            cmd += ("get-bytes {fname}".
+                                    format(fname=GETNAME).split())
                             proc = remote.run(args=cmd, check_status=False)
                             if proc.exitstatus != 0:
-                                remote.run(args="rm -f {getfile}".format(getfile=GETNAME).split())
-                                log.error("Bad exit status {ret}".format(ret=proc.exitstatus))
+                                remote.run(args="rm -f {getfile}".
+                                           format(getfile=GETNAME).split())
+                                log.error("Bad exit status {ret}".
+                                          format(ret=proc.exitstatus))
                                 ERRORS += 1
                                 continue
-                            cmd = "diff -q {file} {getfile}".format(file=file, getfile=GETNAME)
+                            cmd = ("diff -q {file} {getfile}".
+                                   format(file=file, getfile=GETNAME))
                             proc = remote.run(args=cmd.split())
                             if proc.exitstatus != 0:
                                 log.error("Data from get-bytes differ")
@@ -334,40 +361,57 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                                 # log.debug("Expected:")
                                 # cat_file(logging.DEBUG, file)
                                 ERRORS += 1
-                            remote.run(args="rm -f {getfile}".format(getfile=GETNAME).split())
+                            remote.run(args="rm -f {getfile}".
+                                       format(getfile=GETNAME).split())
 
-                            data = "put-bytes going into {file}\n".format(file=file)
+                            data = ("put-bytes going into {file}\n".
+                                    format(file=file))
                             teuthology.write_file(remote, SETNAME, data)
-                            cmd = (prefix + "--pgid {pg}").format(id=osdid, pg=pg).split()
+                            cmd = ((prefix + "--pgid {pg}").
+                                   format(id=osdid, pg=pg).split())
                             cmd.append(run.Raw("'{json}'".format(json=JSON)))
-                            cmd += "set-bytes {fname}".format(fname=SETNAME).split()
+                            cmd += ("set-bytes {fname}".
+                                    format(fname=SETNAME).split())
                             proc = remote.run(args=cmd, check_status=False)
                             proc.wait()
                             if proc.exitstatus != 0:
-                                log.info("set-bytes failed for object {obj} in pg {pg} osd.{id} ret={ret}".format(obj=basename, pg=pg, id=osdid, ret=proc.exitstatus))
+                                log.info("set-bytes failed for object {obj} "
+                                         "in pg {pg} osd.{id} ret={ret}".
+                                         format(obj=basename, pg=pg,
+                                                id=osdid, ret=proc.exitstatus))
                                 ERRORS += 1
 
-                            cmd = (prefix + "--pgid {pg}").format(id=osdid, pg=pg).split()
+                            cmd = ((prefix + "--pgid {pg}").
+                                   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 = 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))
+                                log.error("get-bytes after "
+                                          "set-bytes ret={ret}".
+                                          format(ret=proc.exitstatus))
                                 ERRORS += 1
                             else:
                                 if data != proc.stdout.getvalue():
-                                    log.error("Data inconsistent after set-bytes, got:")
+                                    log.error("Data inconsistent after "
+                                              "set-bytes, got:")
                                     log.error(proc.stdout.getvalue())
                                     ERRORS += 1
 
-                            cmd = (prefix + "--pgid {pg}").format(id=osdid, pg=pg).split()
+                            cmd = ((prefix + "--pgid {pg}").
+                                   format(id=osdid, pg=pg).split())
                             cmd.append(run.Raw("'{json}'".format(json=JSON)))
-                            cmd += "set-bytes {fname}".format(fname=file).split()
+                            cmd += ("set-bytes {fname}".
+                                    format(fname=file).split())
                             proc = remote.run(args=cmd, check_status=False)
                             proc.wait()
                             if proc.exitstatus != 0:
-                                log.info("set-bytes failed for object {obj} in pg {pg} osd.{id} ret={ret}".format(obj=basename, pg=pg, id=osdid, ret=proc.exitstatus))
+                                log.info("set-bytes failed for object {obj} "
+                                         "in pg {pg} osd.{id} ret={ret}".
+                                         format(obj=basename, pg=pg,
+                                                id=osdid, ret=proc.exitstatus))
                                 ERRORS += 1
 
     log.info("Test list-attrs get-attr")
@@ -386,55 +430,76 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
 
                 for pg, JSON in db[basename]["pg2json"].iteritems():
                     if pg in pgs[osdid]:
-                        cmd = (prefix + "--pgid {pg}").format(id=osdid, pg=pg).split()
+                        cmd = ((prefix + "--pgid {pg}").
+                               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 = remote.run(args=cmd, check_status=False,
+                                          stdout=StringIO(), stderr=StringIO())
                         proc.wait()
                         if proc.exitstatus != 0:
-                            log.error("Bad exit status {ret}".format(ret=proc.exitstatus))
+                            log.error("Bad exit status {ret}".
+                                      format(ret=proc.exitstatus))
                             ERRORS += 1
                             continue
                         keys = proc.stdout.getvalue().split()
                         values = dict(db[basename]["xattr"])
 
                         for key in keys:
-                            if key == "_" or key == "snapset" or key == "hinfo_key":
+                            if (key == "_" or
+                                    key == "snapset" or
+                                    key == "hinfo_key"):
                                 continue
                             key = key.strip("_")
                             if key not in values:
-                                log.error("The key {key} should be present".format(key=key))
+                                log.error("The key {key} should be present".
+                                          format(key=key))
                                 ERRORS += 1
                                 continue
                             exp = values.pop(key)
-                            cmd = (prefix + "--pgid {pg}").format(id=osdid, pg=pg).split()
+                            cmd = ((prefix + "--pgid {pg}").
+                                   format(id=osdid, pg=pg).split())
                             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())
+                            cmd += ("get-attr {key}".
+                                    format(key="_" + key).split())
+                            proc = remote.run(args=cmd, check_status=False,
+                                              stdout=StringIO())
                             proc.wait()
                             if proc.exitstatus != 0:
-                                log.error("get-attr failed with {ret}".format(ret=proc.exitstatus))
+                                log.error("get-attr failed with {ret}".
+                                          format(ret=proc.exitstatus))
                                 ERRORS += 1
                                 continue
                             val = proc.stdout.getvalue()
                             if exp != val:
-                                log.error("For key {key} got value {got} instead of {expected}".format(key=key, got=val, expected=exp))
+                                log.error("For key {key} got value {got} "
+                                          "instead of {expected}".
+                                          format(key=key, got=val,
+                                                 expected=exp))
                                 ERRORS += 1
                         if "hinfo_key" in keys:
                             cmd_prefix = prefix.format(id=osdid)
                             cmd = """
-                            expected=$({prefix} --pgid {pg} '{json}' get-attr {key} | base64)
-                            echo placeholder | {prefix} --pgid {pg} '{json}' set-attr {key} -
-                            test $({prefix} --pgid {pg} '{json}' get-attr {key}) = placeholder
-                            echo $expected | base64 --decode | {prefix} --pgid {pg} '{json}' set-attr {key} -
-                            test $({prefix} --pgid {pg} '{json}' get-attr {key} | base64) = $expected
-                            """.format(prefix=cmd_prefix, pg=pg, json=JSON, key="hinfo_key")
+      expected=$({prefix} --pgid {pg} '{json}' get-attr {key} | base64)
+      echo placeholder | {prefix} --pgid {pg} '{json}' set-attr {key} -
+      test $({prefix} --pgid {pg} '{json}' get-attr {key}) = placeholder
+      echo $expected | base64 --decode | \
+         {prefix} --pgid {pg} '{json}' set-attr {key} -
+      test $({prefix} --pgid {pg} '{json}' get-attr {key} | base64) = $expected
+                            """.format(prefix=cmd_prefix, pg=pg, json=JSON,
+                                       key="hinfo_key")
                             log.debug(cmd)
-                            proc = remote.run(args=['bash', '-e', '-x', '-c', cmd], check_status=False, stdout=StringIO(), stderr=StringIO())
+                            proc = remote.run(args=['bash', '-e', '-x',
+                                                    '-c', cmd],
+                                              check_status=False,
+                                              stdout=StringIO(),
+                                              stderr=StringIO())
                             proc.wait()
                             if proc.exitstatus != 0:
-                                log.error("failed with " + str(proc.exitstatus))
-                                log.error(proc.stdout.getvalue() + " " + proc.stderr.getvalue())
+                                log.error("failed with " +
+                                          str(proc.exitstatus))
+                                log.error(proc.stdout.getvalue() + " " +
+                                          proc.stderr.getvalue())
                                 ERRORS += 1
 
                         if len(values) != 0:
@@ -451,11 +516,14 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                 continue
 
             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())
+                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:
-                    log.error("Failure of --op info command with {ret}".format(proc.exitstatus))
+                    log.error("Failure of --op info command with {ret}".
+                              format(proc.exitstatus))
                     ERRORS += 1
                     continue
                 info = proc.stdout.getvalue()
@@ -473,19 +541,25 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                 continue
 
             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())
+                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:
-                    log.error("Getting log failed for pg {pg} from osd.{id} with {ret}".format(pg=pg, id=osdid, ret=proc.exitstatus))
+                    log.error("Getting log failed for pg {pg} "
+                              "from osd.{id} with {ret}".
+                              format(pg=pg, id=osdid, ret=proc.exitstatus))
                     ERRORS += 1
                     continue
                 HASOBJ = pg in pgswithobjects
                 MODOBJ = "modify" in proc.stdout.getvalue()
                 if HASOBJ != MODOBJ:
-                    log.error("Bad log for pg {pg} from osd.{id}".format(pg=pg, id=osdid))
+                    log.error("Bad log for pg {pg} from osd.{id}".
+                              format(pg=pg, id=osdid))
                     MSG = (HASOBJ and [""] or ["NOT "])[0]
-                    log.error("Log should {msg}have a modify entry".format(msg=MSG))
+                    log.error("Log should {msg}have a modify entry".
+                              format(msg=MSG))
                     ERRORS += 1
 
     log.info("Test pg export")
@@ -499,13 +573,18 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                 continue
 
             for pg in pgs[osdid]:
-                fpath = os.path.join(DATADIR, "osd{id}.{pg}".format(id=osdid, pg=pg))
+                fpath = os.path.join(DATADIR, "osd{id}.{pg}".
+                                     format(id=osdid, pg=pg))
 
-                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())
+                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:
-                    log.error("Exporting failed for pg {pg} on osd.{id} with {ret}".format(pg=pg, id=osdid, ret=proc.exitstatus))
+                    log.error("Exporting failed for pg {pg} "
+                              "on osd.{id} with {ret}".
+                              format(pg=pg, id=osdid, ret=proc.exitstatus))
                     EXP_ERRORS += 1
 
     ERRORS += EXP_ERRORS
@@ -521,11 +600,15 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                 continue
 
             for pg in pgs[osdid]:
-                cmd = (prefix + "--op remove --pgid {pg}").format(pg=pg, id=osdid)
-                proc = remote.run(args=cmd, check_status=False, stdout=StringIO())
+                cmd = ((prefix + "--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:
-                    log.error("Removing failed for pg {pg} on osd.{id} with {ret}".format(pg=pg, id=osdid, ret=proc.exitstatus))
+                    log.error("Removing failed for pg {pg} "
+                              "on osd.{id} with {ret}".
+                              format(pg=pg, id=osdid, ret=proc.exitstatus))
                     RM_ERRORS += 1
 
     ERRORS += RM_ERRORS
@@ -543,13 +626,17 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                     continue
 
                 for pg in pgs[osdid]:
-                    fpath = os.path.join(DATADIR, "osd{id}.{pg}".format(id=osdid, pg=pg))
+                    fpath = os.path.join(DATADIR, "osd{id}.{pg}".
+                                         format(id=osdid, pg=pg))
 
-                    cmd = (prefix + "--op import --file {file}").format(id=osdid, file=fpath)
-                    proc = remote.run(args=cmd, check_status=False, stdout=StringIO())
+                    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:
-                        log.error("Import failed from {file} with {ret}".format(file=fpath, ret=proc.exitstatus))
+                        log.error("Import failed from {file} with {ret}".
+                                  format(file=fpath, ret=proc.exitstatus))
                         IMP_ERRORS += 1
     else:
         log.warning("SKIPPING IMPORT TESTS DUE TO PREVIOUS FAILURES")
@@ -571,15 +658,18 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
             TESTNAME = os.path.join(DATADIR, "gettest")
             REFNAME = os.path.join(DATADIR, NAME)
 
-            proc = rados(ctx, cli_remote, ['-p', REP_POOL, 'get', NAME, TESTNAME], wait=False)
+            proc = rados(ctx, cli_remote,
+                         ['-p', REP_POOL, 'get', NAME, TESTNAME], wait=False)
 
             ret = proc.wait()
             if ret != 0:
-                log.error("After import, rados get failed with {ret}".format(ret=proc.exitstatus))
+                log.error("After import, rados get failed with {ret}".
+                          format(ret=proc.exitstatus))
                 ERRORS += 1
                 continue
 
-            cmd = "diff -q {gettest} {ref}".format(gettest=TESTNAME, ref=REFNAME)
+            cmd = "diff -q {gettest} {ref}".format(gettest=TESTNAME,
+                                                   ref=REFNAME)
             proc = cli_remote.run(args=cmd, check_status=False)
             proc.wait()
             if proc.exitstatus != 0: