]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/.../client_request: rename with_pg_int to with_pg_process
authorSamuel Just <sjust@redhat.com>
Sun, 4 Feb 2024 22:29:38 +0000 (14:29 -0800)
committerMatan Breizman <mbreizma@redhat.com>
Thu, 16 May 2024 11:39:18 +0000 (14:39 +0300)
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 13042dde1134983f074f5bd4cf4c912d47d0193c)

src/crimson/osd/osd_operations/client_request.cc
src/crimson/osd/osd_operations/client_request.h

index 571a6ec64a4d3f853c16dc23511f0991a5a08a6b..0e5dfac130277d48976293ad6068b6f3b8f22e82 100644 (file)
@@ -25,7 +25,7 @@ void ClientRequest::Orderer::requeue(Ref<PG> 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<PG> pgref)
+seastar::future<> ClientRequest::with_pg_process(Ref<PG> 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;
 }
 
index 8bf396232a6656112af71f36daee63657dc24072..48fac7f910366c7f8d52cc8641c3d3cb4936c074 100644 (file)
@@ -253,7 +253,7 @@ public:
     r_conn = make_local_shared_foreign(std::move(conn));
   }
 
-  seastar::future<> with_pg_int(Ref<PG> pg);
+  seastar::future<> with_pg_process(Ref<PG> pg);
 
 public:
   seastar::future<> with_pg(