crimson/osd: PCBackend::_submit_transaction() takes ObjectContext

For the sake of ECBackend.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/ec_backend.cc b/src/crimson/osd/ec_backend.cc
index b7afe5452209ed33109c4b481d31f55518ac9707..1b711ec0f2b0fa44f63da2d88812b8a0289b0779 100644 (file)
--- a/src/crimson/osd/ec_backend.cc
+++ b/src/crimson/osd/ec_backend.cc
@@ -242,7 +242,7 @@ struct ECCrimsonOp : ECCommon::RMWPipeline::Op {
 };
 ECBackend::rep_op_fut_t
 ECBackend::submit_transaction(const std::set<pg_shard_t> &pg_shards,
-                              const hobject_t& hoid,
+                              crimson::osd::ObjectContextRef&& obc,
                              crimson::osd::ObjectContextRef&& new_clone,
                               ceph::os::Transaction&& txn,
                               osd_op_params_t&& osd_op_p,

diff --git a/src/crimson/osd/ec_backend.h b/src/crimson/osd/ec_backend.h
index 36af2451d41fbd0d813e71f3a91f9c2904867a41..406b2284d20bbc8919e650cdc89b46bc82bc4ef3 100644 (file)
--- a/src/crimson/osd/ec_backend.h
+++ b/src/crimson/osd/ec_backend.h
@@ -53,7 +53,7 @@ private:
   _read(const hobject_t& hoid, uint64_t off, uint64_t len, uint32_t flags) override;
   rep_op_fut_t
   submit_transaction(const std::set<pg_shard_t> &pg_shards,
-                    const hobject_t& hoid,
+                    crimson::osd::ObjectContextRef&& obc,
                     crimson::osd::ObjectContextRef&& new_clone,
                     ceph::os::Transaction&& txn,
                     osd_op_params_t&& req,

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 6a785a880fc7c6655b3cbcb3387d9400404e9d0e..0d1590096ec804f1bb8f8270328a7fc41a4f4148 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -987,7 +987,7 @@ PG::submit_transaction(
 
   auto [submitted, all_completed] = co_await backend->submit_transaction(
       peering_state.get_acting_recovery_backfill(),
-      obc->obs.oi.soid,
+      std::move(obc),
       std::move(new_clone),
       std::move(txn),
       std::move(osd_op_p),

diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h
index 6c1abd0f3b371d36af016dfb59fde928481e76a8..3eac0b4725348cb5cd20249ccc9163e0d79366ce 100644 (file)
--- a/src/crimson/osd/pg_backend.h
+++ b/src/crimson/osd/pg_backend.h
@@ -426,7 +426,7 @@ public:
 
   virtual rep_op_fut_t
   submit_transaction(const std::set<pg_shard_t> &pg_shards,
-                    const hobject_t& hoid,
+                    crimson::osd::ObjectContextRef&& obc,
                     crimson::osd::ObjectContextRef&& new_clone,
                     ceph::os::Transaction&& txn,
                     osd_op_params_t&& osd_op_p,

diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc
index 9fc921294c6e2255e0103a2c5fc00c8830cce85a..1c8d5e90351a4452043b09a0996221f9519eb298 100644 (file)
--- a/src/crimson/osd/replicated_backend.cc
+++ b/src/crimson/osd/replicated_backend.cc
@@ -93,7 +93,7 @@ MURef<MOSDRepOp> ReplicatedBackend::new_repop_msg(
 ReplicatedBackend::rep_op_fut_t
 ReplicatedBackend::submit_transaction(
   const std::set<pg_shard_t> &pg_shards,
-  const hobject_t& hoid,
+  crimson::osd::ObjectContextRef &&obc,
   crimson::osd::ObjectContextRef &&new_clone,
   ceph::os::Transaction&& t,
   osd_op_params_t&& opp,
@@ -101,6 +101,7 @@ ReplicatedBackend::submit_transaction(
   std::vector<pg_log_entry_t>&& logv)
 {
   LOG_PREFIX(ReplicatedBackend::submit_transaction);
+  const hobject_t& hoid = obc->obs.oi.soid;
   DEBUGDPP("object {}", dpp, hoid);
   auto log_entries = std::move(logv);
   auto txn = std::move(t);

diff --git a/src/crimson/osd/replicated_backend.h b/src/crimson/osd/replicated_backend.h
index 88110e5a54b7890af71a7aebaeba8adb009f2d0c..d1e2cef732fcb1ea3751c1698df562c8771d7537 100644 (file)
--- a/src/crimson/osd/replicated_backend.h
+++ b/src/crimson/osd/replicated_backend.h
@@ -40,7 +40,7 @@ private:
          uint64_t len, uint32_t flags) override;
   rep_op_fut_t submit_transaction(
     const std::set<pg_shard_t> &pg_shards,
-    const hobject_t& hoid,
+    crimson::osd::ObjectContextRef&& obc,
     crimson::osd::ObjectContextRef&& new_clone,
     ceph::os::Transaction&& txn,
     osd_op_params_t&& osd_op_p,