From ca794dc3666cb51e8eefd55886e537ffc4a6eca4 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Sun, 4 Feb 2024 14:28:46 -0800 Subject: [PATCH] crimson/.../client_request.cc: move message decode check to with_pg We only need to do this once, no need to recheck on requeue. Signed-off-by: Samuel Just (cherry picked from commit 10a9a11f5d535044f081964dc6b79813aa9bb624) --- src/crimson/osd/osd_operations/client_request.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc index 7c1e7d321cf..571a6ec64a4 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -105,9 +105,6 @@ seastar::future<> ClientRequest::with_pg_int(Ref pgref) LOG_PREFIX(ClientRequest::with_pg_int); epoch_t same_interval_since = pgref->get_interval_start_epoch(); DEBUGDPP("{}: same_interval_since: {}", *pgref, *this, same_interval_since); - if (m->finish_decode()) { - m->clear_payload(); - } const auto this_instance_id = instance_id++; OperationRef opref{this}; auto instance_handle = get_instance_handle(); @@ -184,6 +181,11 @@ seastar::future<> ClientRequest::with_pg( { shard_services = &_shard_services; pgref->client_request_orderer.add_request(*this); + + if (m->finish_decode()) { + m->clear_payload(); + } + auto ret = on_complete.get_future(); std::ignore = with_pg_int(std::move(pgref)); return ret; -- 2.39.5