]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/.../peering_event: use peering event epoch for interruption
authorSamuel Just <sjust@redhat.com>
Thu, 4 Jul 2024 03:45:58 +0000 (20:45 -0700)
committerMatan Breizman <mbreizma@redhat.com>
Thu, 25 Jul 2024 07:53:41 +0000 (10:53 +0300)
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 867be2c3f5949ac9d19c205491dcf649acc57271)

src/crimson/osd/osd_operations/peering_event.cc

index 6c1afd3d3360f888a482fb80e613bad072315a7a..cdd7fb9b533d18651bc5d21809105506efebcaed 100644 (file)
@@ -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();
   });