]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_manager: Fix Thrasher kill_osd() to ignore pool going away
authorDavid Zafman <dzafman@redhat.com>
Mon, 15 Dec 2014 18:06:02 +0000 (10:06 -0800)
committerLoic Dachary <ldachary@redhat.com>
Tue, 13 Jan 2015 13:37:35 +0000 (14:37 +0100)
Signed-off-by: David Zafman <dzafman@redhat.com>
tasks/ceph_manager.py

index dd36f83d65047e1306859ab69cb2170ac4695ba2..561499568ae6710523eed1155a61e19b33b4cb9f 100644 (file)
@@ -220,7 +220,9 @@ class Thrasher:
             # import
             cmd = (prefix + "--op import --file {file}").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))
             cmd = "rm -f {file}".format(file=exp_path)
             exp_remote.run(args=cmd)