From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 21 May 2025 13:35:34 +0000 (+0000)
Subject: fixup: crimson/osd: translate for os::Transaction into ECTransaction
X-Git-Tag: v21.0.0~3^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4fa7c654ceaf882493945b6084bc50c833202eb;p=ceph.git

fixup: crimson/osd: translate for os::Transaction into ECTransaction

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 833c62411809..d7e2a389166b 100644
--- a/src/crimson/osd/ec_backend.cc
+++ b/src/crimson/osd/ec_backend.cc
@@ -239,13 +239,13 @@ struct ECCrimsonOp : ECCommon::RMWPipeline::Op {
   }
 
   void generate_transactions(
-      ceph::ErasureCodeInterfaceRef &ecimpl,
+      ceph::ErasureCodeInterfaceRef &ec_impl,
       pg_t pgid,
       const ECUtil::stripe_info_t &sinfo,
-      std::map<hobject_t,extent_map> *written,
-      std::map<shard_id_t, ObjectStore::Transaction> *transactions,
+      std::map<hobject_t, ECUtil::shard_extent_map_t> *written,
+      shard_id_map<ceph::os::Transaction> *transactions,
       DoutPrefixProvider *dpp,
-      const ceph_release_t require_osd_release) final
+      const OSDMapRef &osdmap) final
   {
     assert(t);
 #if 1
@@ -265,6 +265,17 @@ struct ECCrimsonOp : ECCommon::RMWPipeline::Op {
       require_osd_release);
 #endif
   }
+
+  bool skip_transaction(
+      std::set<shard_id_t> &pending_roll_forward,
+      shard_id_t shard,
+      ceph::os::Transaction &transaction) final {
+    if (transaction.empty()) {
+      return true;
+    }
+    pending_roll_forward.insert(shard);
+    return false;
+  }
 };
 
 class C_AllSubWritesCommited : public Context {