osd: prepare get_write_plan() for moving from ECBackend to ECCommon

For the sake of sharing with crimson.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit dc5b0910a500363b62cfda8be44b4bed634f9cd6)

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 2716b72a532088ace9d178f69e3c85a8eafcb057..bb90be1488569b2a05c2c7ccc21645cc5c069d17 100644 (file)
--- 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 7f3f9418f4649427b607ef2a1bfb236771a0c35b..90452f2ba1d847f2d2dfb2ef12a9969713bdbdcc 100644 (file)
--- 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: