From 51c534863ec368f0daec7c955102ac91010236cd Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 23 Apr 2024 14:04:02 +0000 Subject: [PATCH] crimson/osd: s/fill_op_params_bump_pg_version/fill_op_params/ in OpsExecuter Since https://github.com/ceph/ceph/pull/53054 it doesn't bump `PG::projected_last_update` anymore. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit eca3d26124cdbe5eff0d2e356417c977a37e115a) --- src/crimson/osd/ops_executer.cc | 4 ++-- src/crimson/osd/ops_executer.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc index 6738b01f7acba..5564c5dbb2afc 100644 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@ -466,7 +466,7 @@ auto OpsExecuter::do_write_op(Func&& f, OpsExecuter::modified_by m) { ++num_write; if (!osd_op_params) { osd_op_params.emplace(); - fill_op_params_bump_pg_version(m); + fill_op_params(m); } return std::forward(f)(pg->get_backend(), obc->obs, txn); } @@ -801,7 +801,7 @@ OpsExecuter::do_execute_op(OSDOp& osd_op) } } -void OpsExecuter::fill_op_params_bump_pg_version(OpsExecuter::modified_by m) +void OpsExecuter::fill_op_params(OpsExecuter::modified_by m) { osd_op_params->req_id = msg->get_reqid(); osd_op_params->mtime = msg->get_mtime(); diff --git a/src/crimson/osd/ops_executer.h b/src/crimson/osd/ops_executer.h index 027d0032986f8..2774411ebcda3 100644 --- a/src/crimson/osd/ops_executer.h +++ b/src/crimson/osd/ops_executer.h @@ -423,7 +423,7 @@ public: MutFunc&& mut_func) &&; std::vector prepare_transaction( const std::vector& ops); - void fill_op_params_bump_pg_version(modified_by m); + void fill_op_params(modified_by m); ObjectContextRef get_obc() const { return obc; -- 2.39.5