From 14be39509b4e73fccf61cc441c64303f7da2f866 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 15 Oct 2024 14:19:48 -0700 Subject: [PATCH] crimson: InternalClientRequests require that the pg is already active Signed-off-by: Samuel Just --- .../osd/osd_operations/internal_client_request.cc | 9 +-------- src/crimson/osd/pg.h | 3 +++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/osd_operations/internal_client_request.cc b/src/crimson/osd/osd_operations/internal_client_request.cc index 9692556e790e4..4790025065afe 100644 --- a/src/crimson/osd/osd_operations/internal_client_request.cc +++ b/src/crimson/osd/osd_operations/internal_client_request.cc @@ -82,14 +82,7 @@ InternalClientRequest::interruptible_future<> InternalClientRequest::with_interruption() { LOG_PREFIX(InternalClientRequest::with_interruption); - co_await enter_stage( - client_pp().wait_for_active - ); - - co_await with_blocking_event([this] (auto&& trigger) { - return pg->wait_for_active_blocker.wait(std::move(trigger)); - }); + assert(pg->is_active()); co_await enter_stage(client_pp().recover_missing); diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 0efb942126a69..b0429c8fb4f20 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -518,6 +518,9 @@ public: // Utility + bool is_active() const { + return peering_state.is_active(); + } bool is_active_clean() const { return peering_state.is_active() && peering_state.is_clean(); } -- 2.39.5