crimson/osd: tackle the get_write_plan() problem of ECBackend

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/ec_backend.cc b/src/crimson/osd/ec_backend.cc
index 333acaf14ae3ea21cffd59a8169723a60e87b7a4..4ca9f3bf75ecbf2570570d9b8ec5d822d3483d40 100644 (file)
--- a/src/crimson/osd/ec_backend.cc
+++ b/src/crimson/osd/ec_backend.cc
@@ -263,22 +263,6 @@ struct ECCrimsonOp : ECCommon::RMWPipeline::Op {
       &temp_cleared,
       dpp,
       require_osd_release);
-#endif
-  }
-
-  template <typename F>
-  static ECTransaction::WritePlan get_write_plan(
-    const ECUtil::stripe_info_t &sinfo,
-    PGTransaction& t,
-    F &&get_hinfo,
-    DoutPrefixProvider *dpp)
-  {
-#if 1
-    return ECTransaction::get_write_plan(
-      sinfo,
-      t,
-      std::forward<F>(get_hinfo),
-      dpp);
 #endif
   }
 };
@@ -325,9 +309,11 @@ ECBackend::submit_transaction(const std::set<pg_shard_t> &pg_shards,
   //if (client_op) {
   //  op->trace = client_op->pg_trace;
   //}
-  op->plan = op->get_write_plan(
+  op->plan = ECCommon::get_write_plan(
     sinfo,
     *(op->t),
+    read_pipeline,
+    rmw_pipeline,
     &dpp);
   logger().info("{}: op {} starting", "_submit_transaction", ""); //*op);
   rmw_pipeline.start_rmw(std::move(op));