From: David Zafman <dzafman@redhat.com>
Date: Mon, 15 Dec 2014 18:06:02 +0000 (-0800)
Subject: ceph_manager: Fix Thrasher kill_osd() to ignore pool going away
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=402d224fcad46cbe811a16f80454a65d41cbc121;p=ceph.git

ceph_manager: Fix Thrasher kill_osd() to ignore pool going away

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

Conflicts:
	tasks/ceph_manager.py
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 2f35525638c17..949e46a98ac35 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -201,8 +201,13 @@ 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:
-                raise Exception("ceph-objectstore-tool: import failure with status {ret}".format(ret=proc.exitstatus))
+            if proc.exitstatus == 10:
+                self.log("Pool went away before processing an import"
+                         "...ignored");
+            elif proc.exitstatus:
+                raise Exception("ceph-objectstore-tool: "
+                                "import failure with status {ret}".
+                                format(ret=proc.exitstatus))
             cmd = "rm -f {file}".format(file=exp_path)
             exp_remote.run(args=cmd)
             if imp_remote != exp_remote: