crimson/.../internal_client_request: record epoch at construction and use for interru...

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

diff --git a/src/crimson/osd/osd_operations/internal_client_request.cc b/src/crimson/osd/osd_operations/internal_client_request.cc
index d72c128683da98b1fc25276fba24968c024c6edf..22d7f3e492ad4865a72b353b76ce30e7c171e01b 100644 (file)
--- a/src/crimson/osd/osd_operations/internal_client_request.cc
+++ b/src/crimson/osd/osd_operations/internal_client_request.cc
@@ -25,7 +25,7 @@ SET_SUBSYS(osd);
 namespace crimson::osd {
 
 InternalClientRequest::InternalClientRequest(Ref<PG> pg)
-  : pg(std::move(pg))
+  : pg(pg), start_epoch(pg->get_osdmap_epoch())
 {
   assert(bool(this->pg));
   assert(this->pg->is_primary());
@@ -125,7 +125,7 @@ seastar::future<> InternalClientRequest::start()
         } else {
           return seastar::stop_iteration::no;
         }
-      }, pg);
+      }, pg, start_epoch);
     }).then([this] {
       track_event<CompletionEvent>();
     }).finally([this] {

diff --git a/src/crimson/osd/osd_operations/internal_client_request.h b/src/crimson/osd/osd_operations/internal_client_request.h
index 97ce0492f54751cacf91f58ec0a45e6fd678d167..f198e5846433801c875b4b8e37e9b3bd7c291e62 100644 (file)
--- a/src/crimson/osd/osd_operations/internal_client_request.h
+++ b/src/crimson/osd/osd_operations/internal_client_request.h
@@ -44,6 +44,7 @@ private:
   seastar::future<> do_process();
 
   Ref<PG> pg;
+  epoch_t start_epoch;
   OpInfo op_info;
   PipelineHandle handle;