]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: Use ceph-objectstore-tool --no-overwrite for import-rados
authorDavid Zafman <dzafman@redhat.com>
Tue, 3 Feb 2015 01:41:12 +0000 (17:41 -0800)
committerDavid Zafman <dzafman@redhat.com>
Wed, 13 May 2015 20:09:14 +0000 (13:09 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/test/ceph_objectstore_tool.py

index ee5ae52ecd05a3fc47029216885ab62a8e71a964..035ceb3703b85949206610e7b3213448a9e042a6 100755 (executable)
@@ -1094,6 +1094,12 @@ def main(argv):
                 if ret != 0:
                     logging.error("Import-rados failed from {file} with {ret}".format(file=file, ret=ret))
                     ERRORS += 1
+                cmd = "./ceph-objectstore-tool --no-overwrite import-rados {pool} {file}".format(pool=NEWPOOL, file=file)
+                logging.debug(cmd)
+                ret = call(cmd, shell=True, stdout=nullfd)
+                if ret != 0:
+                    logging.error("Import-rados failed from {file} with {ret}".format(file=file, ret=ret))
+                    ERRORS += 1
 
         ERRORS += verify(DATADIR, NEWPOOL, REP_NAME)
     else: