Skip to content

Commit

Permalink
tests: ignore bogus ceph-objectstore-tool error in ceph_manager
Browse files Browse the repository at this point in the history
Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 046e873)
  • Loading branch information
smithfarm committed Feb 3, 2017
1 parent 83af8cd commit 3f8373e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion qa/tasks/ceph_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,12 @@ def kill_osd(self, osd=None, mark_down=False, mark_out=False):
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:
Expand Down

0 comments on commit 3f8373e

Please sign in to comment.