From: Samuel Just Date: Sun, 4 Feb 2024 22:29:38 +0000 (-0800) Subject: crimson/.../client_request: rename with_pg_int to with_pg_process X-Git-Tag: v19.1.1~356^2~9 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=82b41cbb8d7754488626f1ebdd87876b979f9e6a;p=ceph.git crimson/.../client_request: rename with_pg_int to with_pg_process Signed-off-by: Samuel Just (cherry picked from commit 13042dde1134983f074f5bd4cf4c912d47d0193c) --- diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc index 571a6ec64a4d3..0e5dfac130277 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -25,7 +25,7 @@ void ClientRequest::Orderer::requeue(Ref pg) for (auto &req: list) { DEBUGDPP("requeueing {}", *pg, req); req.reset_instance_handle(); - std::ignore = req.with_pg_int(pg); + std::ignore = req.with_pg_process(pg); } } @@ -98,11 +98,11 @@ bool ClientRequest::is_pg_op() const [](auto& op) { return ceph_osd_op_type_pg(op.op.op); }); } -seastar::future<> ClientRequest::with_pg_int(Ref pgref) +seastar::future<> ClientRequest::with_pg_process(Ref pgref) { ceph_assert_always(shard_services); + LOG_PREFIX(ClientRequest::with_pg_process); - 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); const auto this_instance_id = instance_id++; @@ -187,7 +187,7 @@ seastar::future<> ClientRequest::with_pg( } auto ret = on_complete.get_future(); - std::ignore = with_pg_int(std::move(pgref)); + std::ignore = with_pg_process(std::move(pgref)); return ret; } diff --git a/src/crimson/osd/osd_operations/client_request.h b/src/crimson/osd/osd_operations/client_request.h index 8bf396232a665..48fac7f910366 100644 --- a/src/crimson/osd/osd_operations/client_request.h +++ b/src/crimson/osd/osd_operations/client_request.h @@ -253,7 +253,7 @@ public: r_conn = make_local_shared_foreign(std::move(conn)); } - seastar::future<> with_pg_int(Ref pg); + seastar::future<> with_pg_process(Ref pg); public: seastar::future<> with_pg(