Merge pull request ceph#61267 from athanatos/sjust/wip-rep-pipeline-fix

crimson/.../replicated_request: fix pg lifetime in with_pg finally

Reviewed-by: Xuehan Xu <xuxuehan@qianxin.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>

Author: Matan-B

src/crimson/osd/osd_operations/replicated_request.cc

@@ -70,12 +70,21 @@ RepRequest::interruptible_future<> RepRequest::with_pg_interruptible(
   LOG_PREFIX(RepRequest::with_pg_interruptible);
   DEBUGI("{}", *this);
   co_await this->template enter_stage<interruptor>(repop_pipeline(*pg).process);
-  co_await interruptor::make_interruptible(this->template with_blocking_event<
-    PG_OSDMapGate::OSDMapBlocker::BlockingEvent
-    >([this, pg](auto &&trigger) {
-      return pg->osdmap_gate.wait_for_map(
-	std::move(trigger), req->min_epoch);
-    }));
+  {
+    /* Splitting this expression into a fut and a seperate co_await
+     * works around a gcc 11 bug (observed on 11.4.1 and gcc 11.5.0)
+     * which results in the pg ref captured by the lambda being
+     * destructed twice.  We can probably remove these workarounds
+     * once we disallow gcc 11 */
+    auto fut = interruptor::make_interruptible(
+      this->template with_blocking_event<
+      PG_OSDMapGate::OSDMapBlocker::BlockingEvent
+      >([this, pg](auto &&trigger) {
+	return pg->osdmap_gate.wait_for_map(
+	  std::move(trigger), req->min_epoch);
+      }));
+    co_await std::move(fut);
+  }
 
   if (pg->can_discard_replica_op(*req)) {
     co_return;
@@ -107,9 +116,11 @@ seastar::future<> RepRequest::with_pg(
     return with_pg_interruptible(pg);
   }, [](std::exception_ptr) {
     return seastar::now();
-  }, pg, pg->get_osdmap_epoch()).finally([this, ref=std::move(ref)] {
+  }, pg, pg->get_osdmap_epoch()
+  ).finally([this, pg, ref=std::move(ref)]() mutable {
     logger().debug("{}: exit", *this);
-    return handle.complete();
+    return handle.complete(
+    ).finally([ref=std::move(ref), pg=std::move(pg)] {});
   });
 }