ceph_manager: don't mark out an out osd on kill_osd(..., mark_out=True)

Fixes

2013-07-27T02:02:23.879 INFO:teuthology.task.thrashosds.thrasher:Recovered, killing an osd
2013-07-27T02:02:23.879 INFO:teuthology.task.thrashosds.thrasher:Killing osd 2, live_osds are [3, 4, 0, 1, 5, 2]
2013-07-27T02:02:24.547 INFO:teuthology.task.thrashosds.thrasher:Removing osd 2, in_osds are: [4, 0, 1, 5]
...
ValueError: list.remove(x): x not in list

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index e09df043778dbcee42161cedf174aaf57074fcaa..ba269bb0e2b7a1e9ccf708bc86672dd3ca090e12 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -55,7 +55,7 @@ class Thrasher:
         self.ceph_manager.kill_osd(osd)
         if mark_down:
             self.ceph_manager.mark_down_osd(osd)
-        if mark_out:
+        if mark_out and osd in self.in_osds:
             self.out_osd(osd)
 
     def blackhole_kill_osd(self, osd=None):