From: Radoslaw Zarzynski Date: Sun, 11 May 2025 09:20:29 +0000 (+0000) Subject: osd: prepare get_write_plan() for moving from ECBackend to ECCommon X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc5b0910a500363b62cfda8be44b4bed634f9cd6;p=ceph.git osd: prepare get_write_plan() for moving from ECBackend to ECCommon For the sake of sharing with crimson. Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 9b786f037638..85dffa81e453 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -991,6 +991,8 @@ void ECBackend::submit_transaction( op->plan = get_write_plan( sinfo, *op->t, + read_pipeline, + rmw_pipeline, get_parent()->get_dpp()); ldpp_dout(get_parent()->get_dpp(), 20) << __func__ << " plans=" << plans @@ -1001,6 +1003,8 @@ void ECBackend::submit_transaction( ECTransaction::WritePlan ECBackend::get_write_plan( const ECUtil::stripe_info_t &sinfo, PGTransaction &t, + ECCommon::ReadPipeline &read_pipeline, + ECCommon::RMWPipeline &rmw_pipeline, DoutPrefixProvider *dpp) { ECTransaction::WritePlan plans; auto obc_map = t.obc_map; @@ -1045,9 +1049,7 @@ ECTransaction::WritePlan ECBackend::get_write_plan( if (plan.to_read) plans.want_read = true; plans.plans.emplace_back(std::move(plan)); }); - ldpp_dout(get_parent()->get_dpp(), 20) << __func__ - << " plans=" << plans - << dendl; + ldpp_dout(dpp, 20) << __func__ << " plans=" << plans << dendl; return plans; } diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h index ed21f6905c2e..7768b7a4efb3 100644 --- a/src/osd/ECBackend.h +++ b/src/osd/ECBackend.h @@ -342,9 +342,11 @@ public: ObjectContextRef &obc_map ); - ECTransaction::WritePlan get_write_plan( + static ECTransaction::WritePlan get_write_plan( const ECUtil::stripe_info_t &sinfo, PGTransaction &t, + ECCommon::ReadPipeline &read_pipeline, + ECCommon::RMWPipeline &rmw_pipeline, DoutPrefixProvider *dpp); public: