From 046e873026c59e733f1844b28ffdc030cbe57b36 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 31 Jan 2017 00:46:22 +0100 Subject: [PATCH] tests: ignore bogus ceph-objectstore-tool error in ceph_manager Fixes: http://tracker.ceph.com/issues/16263 Signed-off-by: Nathan Cutler --- qa/tasks/ceph_manager.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py index 17cf2cb30be..d0e6a27765e 100644 --- a/qa/tasks/ceph_manager.py +++ b/qa/tasks/ceph_manager.py @@ -299,7 +299,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: -- 2.39.5