Merge pull request ceph#17244 from liewegas/wip-21121

osd: subscribe to new osdmap while waiting_for_healthy Reviewed-by: Kefu Chai <[email protected]>
heyingstar · Aug 31, 2017 · 6cf3b5c · 6cf3b5c
2 parents 44d06eb + fbafa65
commit 6cf3b5c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -5688,6 +5688,9 @@ void OSD::start_waiting_for_healthy()
   dout(1) << "start_waiting_for_healthy" << dendl;
   set_state(STATE_WAITING_FOR_HEALTHY);
   last_heartbeat_resample = utime_t();
+
+  // subscribe to osdmap updates, in case our peers really are known to be dead
+  osdmap_subscribe(osdmap->get_epoch() + 1, false);
 }
 
 bool OSD::_is_healthy()