crimson/osd/heartbeat: rename Session::last_epoch_sent (and accessors) to projected_epoch

last_epoch_sent was a confusing name since we also update it when an
MOSDPing from the peer reflects a higher epoch.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit a5d20275f2bd9349177f3106bd1d921a10cf8dde)

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index a728c327fcc867730ce901ddc4acf3599f29050d..1f0c86a568667d2b8caab162d79a123cfe26a7f2 100644 (file)
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -311,18 +311,18 @@ seastar::future<> Heartbeat::maybe_share_osdmap(
   }
   auto& peer = found->second;
 
-  if (peer_epoch > peer.get_last_epoch_sent()) {
-    logger().debug("{} updating session's last epoch sent "
+  if (peer_epoch > peer.get_projected_epoch()) {
+    logger().debug("{} updating session's projected_epoch"
                    "from {} to peer's (id: {}) map epoch of {}",
-                   __func__, peer.get_last_epoch_sent(),
+                   __func__, peer.get_projected_epoch(),
                    from, peer_epoch);
-    peer.set_last_epoch_sent(peer_epoch);
+    peer.set_projected_epoch(peer_epoch);
   }
 
-  if (osdmap_epoch <= peer.get_last_epoch_sent()) {
-    logger().info("{} latest epoch sent {} is already later "
+  if (osdmap_epoch <= peer.get_projected_epoch()) {
+    logger().info("{} projected_epoch {} is already later "
                   "than osdmap epoch of {}",
-                  __func__ , peer.get_last_epoch_sent(),
+                  __func__ , peer.get_projected_epoch(),
                   osdmap_epoch);
     return seastar::now();
   }

diff --git a/src/crimson/osd/heartbeat.h b/src/crimson/osd/heartbeat.h
index 73fcdf7885f7c83c58d81893917148383ffc3d82..c483a689395e8379d55b13082e1f8607409bebe5 100644 (file)
--- a/src/crimson/osd/heartbeat.h
+++ b/src/crimson/osd/heartbeat.h
@@ -277,8 +277,8 @@ class Heartbeat::Session {
   void set_epoch_added(epoch_t epoch_) { epoch = epoch_; }
   epoch_t get_epoch_added() const { return epoch; }
 
-  void set_last_epoch_sent(epoch_t epoch_) { last_sent_epoch = epoch_; }
-  epoch_t get_last_epoch_sent() const { return last_sent_epoch; }
+  void set_projected_epoch(epoch_t epoch_) { projected_epoch = epoch_; }
+  epoch_t get_projected_epoch() const { return projected_epoch; }
 
   bool is_started() const { return connected; }
   bool pinged() const {
@@ -389,8 +389,8 @@ class Heartbeat::Session {
   clock::time_point last_rx_back;
   // most recent epoch we wanted this peer
   epoch_t epoch; // rename me to epoch_added
-  // last epoch sent
-  epoch_t last_sent_epoch = 0;
+  // epoch we expect peer to be at once our sent incrementals are processed
+  epoch_t projected_epoch = 0;
 
   struct reply_t {
     clock::time_point deadline;
@@ -414,8 +414,8 @@ class Heartbeat::Peer final : private Heartbeat::ConnectionListener {
   void set_epoch_added(epoch_t epoch) { session.set_epoch_added(epoch); }
   epoch_t get_epoch_added() const { return session.get_epoch_added(); }
 
-  void set_last_epoch_sent(epoch_t epoch) { session.set_last_epoch_sent(epoch); }
-  epoch_t get_last_epoch_sent() const { return session.get_last_epoch_sent(); }
+  void set_projected_epoch(epoch_t epoch) { session.set_projected_epoch(epoch); }
+  epoch_t get_projected_epoch() const { return session.get_projected_epoch(); }
 
   // if failure, return time_point since last active
   // else, return clock::zero()