From a3c9a763b172a379d811a100260f4023b6b20cc7 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 28 Jul 2015 17:02:28 -0500 Subject: [PATCH] ceph_manager: don't add an osd to live_osds until it's been revived also waits to remove it from dead_osds. this fixes an issue where do_sighup tries to send a signal to an osd that has not been revived yet. Signed-off-by: Andrew Schoen --- tasks/ceph_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index 054abd93890..6e1774335e8 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -355,9 +355,9 @@ class Thrasher: if osd is None: osd = random.choice(self.dead_osds) self.log("Reviving osd %s" % (str(osd),)) - self.live_osds.append(osd) - self.dead_osds.remove(osd) self.ceph_manager.revive_osd(osd, self.revive_timeout) + self.dead_osds.remove(osd) + self.live_osds.append(osd) def out_osd(self, osd=None): """