]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: ignore bogus ceph-objectstore-tool error in ceph_manager
authorNathan Cutler <ncutler@suse.com>
Mon, 30 Jan 2017 23:46:22 +0000 (00:46 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 3 Feb 2017 11:32:24 +0000 (12:32 +0100)
Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 046e873026c59e733f1844b28ffdc030cbe57b36)

qa/tasks/ceph_manager.py

index 746a532de47f00b3a2728675f70ee2178781ffff..f1781d1e6f387e609ffb5051e8dc57eef0105b2e 100644 (file)
@@ -284,7 +284,12 @@ class Thrasher:
             cmd = (prefix + "--op import --file {file}")
             cmd = cmd.format(id=imp_osd, file=exp_path)
             proc = imp_remote.run(args=cmd, wait=True, check_status=False)
-            if proc.exitstatus == 10:
+            output = proc.stderr.getvalue()
+            bogosity = "The OSD you are using is older than the exported PG"
+            if proc.exitstatus == 1 and bogosity in output:
+                self.log("OSD older than exported PG"
+                         "...ignored")
+            elif proc.exitstatus == 10:
                 self.log("Pool went away before processing an import"
                          "...ignored")
             elif proc.exitstatus == 11: