From 41a438aacc20336de94b238ec8dd0737d21067bb Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Sun, 11 May 2025 09:20:29 +0000 Subject: [PATCH] osd: prepare get_write_plan() for moving from ECBackend to ECCommon For the sake of sharing with crimson. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit dc5b0910a500363b62cfda8be44b4bed634f9cd6) --- src/osd/ECBackend.cc | 8 +++++--- src/osd/ECBackend.h | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 2716b72a532..bb90be14885 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 7f3f9418f46..90452f2ba1d 100644 --- a/src/osd/ECBackend.h +++ b/src/osd/ECBackend.h @@ -332,9 +332,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: -- 2.39.5