From 94b3d7632f2548c19beca5a2e024c95f601b61f3 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 1 Apr 2015 10:32:32 -0700 Subject: [PATCH] test: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together Signed-off-by: David Zafman --- src/test/ceph_objectstore_tool.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 65ed4f105f9df..cb31457b956b7 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -596,9 +596,8 @@ def main(argv): print "Test --op list variants" # retrieve all objects from all PGs - cmd = (CFSD_PREFIX + "--op list --format json").format(osd=osd) - logging.debug(cmd) tmpfd = open(TMPFILE, "w") + cmd = (CFSD_PREFIX + "--op list --format json").format(osd=osd) logging.debug(cmd) ret = call(cmd, shell=True, stdout=tmpfd) if ret != 0: @@ -610,9 +609,8 @@ def main(argv): (pgid, jsondict) = json.loads(JSONOBJ[0])[0] # retrieve all objects in a given PG - cmd = (CFSD_PREFIX + "--op list --pgid {pg} --format json").format(osd=osd, pg=pgid) - logging.debug(cmd) tmpfd = open(OTHERFILE, "a") + cmd = (CFSD_PREFIX + "--op list --pgid {pg} --format json").format(osd=osd, pg=pgid) logging.debug(cmd) ret = call(cmd, shell=True, stdout=tmpfd) if ret != 0: @@ -629,9 +627,8 @@ def main(argv): ERRORS += 1 # retrieve all objects with a given name in a given PG - cmd = (CFSD_PREFIX + "--op list --pgid {pg} {object} --format json").format(osd=osd, pg=pgid, object=jsondict['oid']) - logging.debug(cmd) tmpfd = open(OTHERFILE, "w") + cmd = (CFSD_PREFIX + "--op list --pgid {pg} {object} --format json").format(osd=osd, pg=pgid, object=jsondict['oid']) logging.debug(cmd) ret = call(cmd, shell=True, stdout=tmpfd) if ret != 0: @@ -651,8 +648,8 @@ def main(argv): for pg in ALLPGS: OSDS = get_osds(pg, OSDDIR) for osd in OSDS: - cmd = (CFSD_PREFIX + "--op list --pgid {pg}").format(osd=osd, pg=pg) tmpfd = open(TMPFILE, "a") + cmd = (CFSD_PREFIX + "--op list --pgid {pg}").format(osd=osd, pg=pg) logging.debug(cmd) ret = call(cmd, shell=True, stdout=tmpfd) if ret != 0: -- 2.39.5