mson/osd/replicated_recovery_backend: Introduce prep_push_to_repli…

…ca()

Intelligently push an object to a replica.  make use of existing
clones/heads and dup data ranges where possible.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index da416427d62783987aa07b832d6e926f5a9f747c..f78994e8a5af5c48e43cb17616b39d406d9ebfd7 100644 (file)
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -319,14 +319,61 @@ ReplicatedRecoveryBackend::prep_push_to_replica(
 
   auto& recovery_waiter = get_recovering(soid);
   auto& obc = recovery_waiter.obc;
-  // TODO: use calc_clone_subsets
+  SnapSet push_info_ss; // only populated if soid is_snap()
   crimson::osd::subsets_t subsets;
-
+  const auto& missing =
+    pg.get_shard_missing().find(pg_shard)->second;
+
+  // are we doing a clone on the replica?
+  if (soid.snap && soid.snap < CEPH_NOSNAP) {
+    hobject_t head = soid;
+    head.snap = CEPH_NOSNAP;
+
+    // try to base push off of clones that succeed/preceed poid
+    // we need the head (and current SnapSet) locally to do that.
+    if (pg.get_local_missing().is_missing(head)) {
+      logger().debug("{} missing head {}, pushing raw clone",
+                     __func__, head);
+      if (obc->obs.oi.size) {
+        subsets.data_subset.insert(0, obc->obs.oi.size);
+      }
+      return prep_push(soid,
+                       need,
+                       pg_shard,
+                       subsets,
+                       push_info_ss);
+    }
+    auto ssc = obc->ssc;
+    ceph_assert(ssc);
+    push_info_ss = ssc->snapset;
+    logger().debug("push_to_replica snapset is {}",
+                   ssc->snapset);
+
+    subsets = crimson::osd::calc_clone_subsets(
+      ssc->snapset, soid,
+      missing,
+      // get_peer_info() asserts `peer_info` existence.
+      pg.get_peering_state().get_peer_info(
+        pg_shard).last_backfill);
+  } else if (soid.snap == CEPH_NOSNAP) {
+    // pushing head or unversioned object.
+    // base this on partially on replica's clones?
+    auto ssc = obc->ssc;
+    ceph_assert(ssc);
+    logger().debug("push_to_replica snapset is {}",
+                   ssc->snapset);
+    subsets = crimson::osd::calc_head_subsets(
+      obc->obs.oi.size,
+      ssc->snapset, soid,
+      missing,
+      pg.get_peering_state().get_peer_info(
+        pg_shard).last_backfill);
+  }
   return prep_push(soid,
                    need,
                    pg_shard,
-                   subsets);
-
+                   subsets,
+                   push_info_ss);
 }
 
 RecoveryBackend::interruptible_future<PushOp>
@@ -334,7 +381,8 @@ ReplicatedRecoveryBackend::prep_push(
   const hobject_t& soid,
   eversion_t need,
   pg_shard_t pg_shard,
-  const crimson::osd::subsets_t& subsets)
+  const crimson::osd::subsets_t& subsets,
+  const SnapSet push_info_ss)
 {
   logger().debug("{}: {}, {}", __func__, soid, need);
   auto& recovery_waiter = get_recovering(soid);
@@ -350,6 +398,7 @@ ReplicatedRecoveryBackend::prep_push(
   push_info.recovery_info.size = obc->obs.oi.size;
   push_info.recovery_info.copy_subset = subsets.data_subset;
   push_info.recovery_info.clone_subset = subsets.clone_subsets;
+  push_info.recovery_info.ss = push_info_ss;
   push_info.recovery_info.soid = soid;
   push_info.recovery_info.oi = obc->obs.oi;
   push_info.recovery_info.version = obc->obs.oi.version;

diff --git a/src/crimson/osd/replicated_recovery_backend.h b/src/crimson/osd/replicated_recovery_backend.h
index 00e1021b9eb17d431b19162726b6f7c44e07b0a6..8faed2fbf3f298b5e94562b8867d32cac9c3bd4b 100644 (file)
--- a/src/crimson/osd/replicated_recovery_backend.h
+++ b/src/crimson/osd/replicated_recovery_backend.h
@@ -57,7 +57,8 @@ protected:
     const hobject_t& soid,
     eversion_t need,
     pg_shard_t pg_shard,
-    const crimson::osd::subsets_t& subsets);
+    const crimson::osd::subsets_t& subsets,
+    const SnapSet push_info_ss);
   void prepare_pull(
     const crimson::osd::ObjectContextRef &head_obc,
     PullOp& pull_op,