From: David Zafman <dzafman@redhat.com>
Date: Sat, 9 Dec 2017 02:48:21 +0000 (-0800)
Subject: test: ceph_objectstore_tool.py: Perform dump-import
X-Git-Tag: v12.2.3~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e621e9d7f1447f796b3f80475e38bc7de3f9b6a6;p=ceph.git

test: ceph_objectstore_tool.py: Perform dump-import

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit c4602c9ac8f7819abc89c8668fbdc4572341ac5e)
---

diff --git a/qa/standalone/special/ceph_objectstore_tool.py b/qa/standalone/special/ceph_objectstore_tool.py
index 554ba77ef00..63333bef20c 100755
--- a/qa/standalone/special/ceph_objectstore_tool.py
+++ b/qa/standalone/special/ceph_objectstore_tool.py
@@ -1749,6 +1749,13 @@ def main(argv):
             PGS = [f for f in os.listdir(dir) if os.path.isfile(os.path.join(dir, f))]
             for pg in PGS:
                 file = os.path.join(dir, pg)
+                # Make sure this doesn't crash
+                cmd = (CFSD_PREFIX + "--op dump-import --file {file}").format(osd=osd, file=file)
+                logging.debug(cmd)
+                ret = call(cmd, shell=True, stdout=nullfd)
+                if ret != 0:
+                    logging.error("Dump-import failed from {file} with {ret}".format(file=file, ret=ret))
+                    IMP_ERRORS += 1
                 # This should do nothing
                 cmd = (CFSD_PREFIX + "--op import --file {file} --dry-run").format(osd=osd, file=file)
                 logging.debug(cmd)