Skip to content

Commit

Permalink
crimson/osd: cancel timers before restart
Browse files Browse the repository at this point in the history
otherwise we will rearm already-armed timer when booting up OSD again.

Signed-off-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov committed Mar 20, 2019
1 parent 4de0c35 commit c9ced60
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/crimson/osd/osd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,8 @@ bool OSD::should_restart() const

seastar::future<> OSD::restart()
{
beacon_timer.cancel();
heartbeat_timer.cancel();
up_epoch = 0;
bind_epoch = osdmap->get_epoch();
// TODO: promote to shutdown if being marked down for multiple times
Expand Down

0 comments on commit c9ced60

Please sign in to comment.