From 32be3024847a107ca741241ee837a077092bfa32 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 2 Feb 2015 17:41:12 -0800 Subject: [PATCH] test: Use ceph-objectstore-tool --no-overwrite for import-rados Signed-off-by: David Zafman --- src/test/ceph_objectstore_tool.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index ee5ae52ecd05a..035ceb3703b85 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -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: -- 2.39.5