From 59369237c9997b0b64252a970551a7af8395b48f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Jan 2012 06:59:41 -0800 Subject: [PATCH] thrasher: don't mark down osds out; tell monitor same Stopping ceph-osd doesn't make it out (immediately). Prevent monitor from doing this after a delay too so we can keep our notion of what is up/down/in/out accurate. --- teuthology/task/ceph_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 9be890fc6a..5f7ab25b30 100644 --- a/teuthology/task/ceph_manager.py +++ b/teuthology/task/ceph_manager.py @@ -25,6 +25,9 @@ class Thrasher(gevent.Greenlet): self.log = tmp if self.config is None: self.config = dict() + # prevent monitor from auto-marking things out while thrasher runs + manager.raw_cluster_cmd('mon', 'tell', '*', 'injectargs', + '--mon-osd-down-out-interval', '0') gevent.Greenlet.__init__(self, self.do_thrash) self.start() @@ -34,9 +37,6 @@ class Thrasher(gevent.Greenlet): self.log("Killing osd %s, live_osds are %s"%(str(osd),str(self.live_osds))) self.live_osds.remove(osd) self.dead_osds.append(osd) - if osd in self.in_osds: - self.in_osds.remove(osd) - self.out_osds.append(osd) self.ceph_manager.kill_osd(osd) def revive_osd(self, osd=None): -- 2.39.5