From: Samuel Just <sjust@redhat.com>
Date: Thu, 4 Jul 2024 03:45:58 +0000 (-0700)
Subject: crimson/.../peering_event: use peering event epoch for interruption
X-Git-Tag: v19.2.1~307^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5dfb1acef200b4642112239ed1e1bdc7af95833a;p=ceph.git

crimson/.../peering_event: use peering event epoch for interruption

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

diff --git a/src/crimson/osd/osd_operations/peering_event.cc b/src/crimson/osd/osd_operations/peering_event.cc
index 6c1afd3d3360..cdd7fb9b533d 100644
--- a/src/crimson/osd/osd_operations/peering_event.cc
+++ b/src/crimson/osd/osd_operations/peering_event.cc
@@ -107,7 +107,7 @@ seastar::future<> PeeringEvent<T>::with_pg(
   }, [this](std::exception_ptr ep) {
     LOG_PREFIX(PeeringEvent<T>::with_pg);
     DEBUGI("{}: interrupted with {}", *this, ep);
-  }, pg).finally([this] {
+  }, pg, evt.get_epoch_sent()).finally([this] {
     logger().debug("{}: exit", *this);
     that()->get_handle().exit();
   });