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-Tag: v0.94.10~27^2^2~195^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b239dadc02fc8e09c5bf633a06c479494929e85c;p=ceph.git

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

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index a5c1e78439b0..9e9caf7f797a 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -260,7 +260,10 @@ 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:
+            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))