From a039d4ada7a0dc093939f34c501c0014039b74dd Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 27 Jul 2013 07:48:55 -0700 Subject: [PATCH] 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 --- teuthology/task/ceph_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index e09df04377..ba269bb0e2 100644 --- 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): -- 2.39.5