OSD: heartbeat peers need to be updated when a new OSD added into an already existed...

Fixes: http://tracker.ceph.com/issues/18004
Signed-off-by: Pan Liu <pan.liu@istuary.com>
(cherry picked from commit e95026f6be44f5aae93f005d249ffcf66bef15fd)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ce9584a02ed198ff78a3e03ee64aa73cab9a8af3..a67931adc47b5f807f68ff1fbd43cb67add06bce 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6617,6 +6617,7 @@ void OSD::note_down_osd(int peer)
 void OSD::note_up_osd(int peer)
 {
   service.forget_peer_epoch(peer, osdmap->get_epoch() - 1);
+  heartbeat_set_peers_need_update();
 }
 
 struct C_OnMapCommit : public Context {
@@ -6936,6 +6937,10 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
           waited_for_reservations = true;
         }
        note_down_osd(*p);
+      } else if (*p != whoami &&
+                !osdmap->have_inst(*p) &&
+                newmap->is_up(*p)) {
+        note_up_osd(*p);
       }
     }