From: Samuel Just <sjust@redhat.com>
Date: Thu, 4 Jul 2024 03:45:39 +0000 (-0700)
Subject: crimson/.../scrub_events: use epoch at which operation was scheduled for interruption
X-Git-Tag: v19.2.1~307^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d36c9f797fdc86017f3c551aec432895a684982f;p=ceph.git

crimson/.../scrub_events: use epoch at which operation was scheduled for interruption

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

diff --git a/src/crimson/osd/osd_operations/scrub_events.cc b/src/crimson/osd/osd_operations/scrub_events.cc
index 2640456bf954..38bd199cfc9b 100644
--- a/src/crimson/osd/osd_operations/scrub_events.cc
+++ b/src/crimson/osd/osd_operations/scrub_events.cc
@@ -56,7 +56,7 @@ seastar::future<> RemoteScrubEventBaseT<T>::with_pg(
     });
   }, [FNAME, pg, this](std::exception_ptr ep) {
     DEBUGDPP("{} interrupted with {}", *pg, *that(), ep);
-  }, pg);
+  }, pg, epoch);
 }
 
 ScrubRequested::ifut<> ScrubRequested::handle_event(PG &pg)