crimson/osd/heartbeat: Rename Peer's created at epoch

As these getter and setter represent the epoch at which the peer was added

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit bfbbc311f1fc029ef5df3415cada325fbfed4bde)

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index eb476f715da7107db882b140b2a430e8cc78c1c0..a557772d62c64ddba0e2121478121b87db43b85b 100644 (file)
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -124,7 +124,7 @@ void Heartbeat::add_peer(osd_id_t _peer, epoch_t epoch)
   assert(whoami != _peer);
   auto [iter, added] = peers.try_emplace(_peer, *this, _peer);
   auto& peer = iter->second;
-  peer.set_epoch(epoch);
+  peer.set_epoch_added(epoch);
 }
 
 Heartbeat::osds_t Heartbeat::remove_down_peers()
@@ -136,7 +136,7 @@ Heartbeat::osds_t Heartbeat::remove_down_peers()
     if (!osdmap->is_up(osd)) {
       i = peers.erase(i);
     } else {
-      if (peer.get_epoch() < osdmap->get_epoch()) {
+      if (peer.get_epoch_added() < osdmap->get_epoch()) {
         old_osds.push_back(osd);
       }
       ++i;

diff --git a/src/crimson/osd/heartbeat.h b/src/crimson/osd/heartbeat.h
index 12c750b076231c22630008a044471ba11c6c6677..c724b7ed7e40cac6c771e243c97f40af3f21e1ac 100644 (file)
--- a/src/crimson/osd/heartbeat.h
+++ b/src/crimson/osd/heartbeat.h
@@ -274,8 +274,8 @@ class Heartbeat::Session {
  public:
   Session(osd_id_t peer) : peer{peer} {}
 
-  void set_epoch(epoch_t epoch_) { epoch = epoch_; }
-  epoch_t get_epoch() const { return epoch; }
+  void set_epoch_added(epoch_t epoch_) { epoch = epoch_; }
+  epoch_t get_epoch_added() const { return epoch; }
   bool is_started() const { return connected; }
   bool pinged() const {
     if (clock::is_zero(first_tx)) {
@@ -404,8 +404,9 @@ class Heartbeat::Peer final : private Heartbeat::ConnectionListener {
   Peer& operator=(Peer&&) = delete;
   Peer& operator=(const Peer&) = delete;
 
-  void set_epoch(epoch_t epoch) { session.set_epoch(epoch); }
-  epoch_t get_epoch() const { return session.get_epoch(); }
+  // set/get the epoch at which the peer was added
+  void set_epoch_added(epoch_t epoch) { session.set_epoch_added(epoch); }
+  epoch_t get_epoch_added() const { return session.get_epoch_added(); }
 
   // if failure, return time_point since last active
   // else, return clock::zero()