]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: clear failure_queue when marked down
authorSage Weil <sage@newdream.net>
Tue, 20 Jul 2010 20:23:51 +0000 (13:23 -0700)
committerSage Weil <sage@newdream.net>
Tue, 20 Jul 2010 20:24:38 +0000 (13:24 -0700)
This prevents bleed through of failures (due to not getting hearbeats, due
to us being marked down) so they don't get sent after we are marked back
up again.

This fixes one possible source of up/down flapping...

src/osd/OSD.cc

index b60ced34e937a42002ef25a5ce96e6c93b84c4d5..acc44ae66b5ed247adae76e2b83d8f924377412c 100644 (file)
@@ -1191,6 +1191,8 @@ void OSD::reset_heartbeat_peers()
   heartbeat_from_stamp.clear();
   heartbeat_inst.clear();
   heartbeat_lock.Unlock();
+
+  failure_queue.clear();
 }
 
 void OSD::handle_osd_ping(MOSDPing *m)