From: David Zafman <dzafman@redhat.com>
Date: Thu, 20 Nov 2014 00:43:23 +0000 (-0800)
Subject: ceph_objectstore_tool: minor fixes
X-Git-Tag: v0.94.10~27^2^2~233^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6923e68dacd1d0230897b69a40b2005f5867723a;p=ceph.git

ceph_objectstore_tool: minor fixes

Remove development comment
nullfd isn't used anymore
s/log.errors/log.error/

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py
index 8e0dab0aeada3..5d3e533817ae8 100644
--- a/tasks/ceph_objectstore_tool.py
+++ b/tasks/ceph_objectstore_tool.py
@@ -57,11 +57,9 @@ def cod_setup_remote_data(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DAT
         teuthology.write_file(remote, DDNAME, DATA)
 
 
-# def rados(ctx, remote, cmd, wait=True, check_status=False):
 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))
-    nullfd = open(os.devnull, "w")
 
     objects = range(1, NUM_OBJECTS + 1)
     for i in objects:
@@ -117,7 +115,6 @@ def cod_setup(log, ctx, remote, NUM_OBJECTS, DATADIR, BASE_NAME, DATALINECOUNT,
                 log.critical("setomapval failed with {ret}".format(ret=ret))
             db[NAME]["omap"][mykey] = myval
 
-    nullfd.close()
     return ERRORS
 
 
@@ -588,7 +585,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
 
             ret = proc.wait()
             if ret != 0:
-                log.errors("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