crimson/osd: PGRecovery provides dummy BackfillListener.

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

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 9166f4cf0c4d7bf235a1c7d1125d9dd9ee345fd6..0c8a70620092c1de5e22ab6da2f540ba3b84cb8a 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -349,6 +349,7 @@ public:
   void on_backfill_canceled() final {
     ceph_assert(0 == "Not implemented");
   }
+
   void on_recovery_reserved() final {
     recovery_handler->start_pglogbased_recovery();
   }

diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index bc6c56bd60ba9ad31be4bdfee441dd5771aea0f9..1fd67a8de033a487621d9a4bd706b33e71c0eeda 100644 (file)
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -399,3 +399,49 @@ void PGRecovery::_committed_pushed_object(epoch_t epoch,
        __func__);
   }
 }
+
+void PGRecovery::request_replica_scan(
+  const pg_shard_t& target,
+  const hobject_t& begin,
+  const hobject_t& end)
+{
+  ceph_abort_msg("Not implemented");
+}
+
+void PGRecovery::request_primary_scan(
+  const hobject_t& begin)
+{
+  ceph_abort_msg("Not implemented");
+}
+
+void PGRecovery::enqueue_push(
+  const pg_shard_t& target,
+  const hobject_t& obj,
+  const eversion_t& v)
+{
+  ceph_abort_msg("Not implemented");
+}
+
+void PGRecovery::enqueue_drop(
+  const pg_shard_t& target,
+  const hobject_t& obj,
+  const eversion_t& v)
+{
+  ceph_abort_msg("Not implemented");
+}
+
+void PGRecovery::update_peers_last_backfill(
+  const hobject_t& new_last_backfill)
+{
+  ceph_abort_msg("Not implemented");
+}
+
+bool PGRecovery::budget_available() const
+{
+  ceph_abort_msg("Not implemented");
+}
+
+void PGRecovery::backfilled()
+{
+  ceph_abort_msg("Not implemented");
+}

diff --git a/src/crimson/osd/pg_recovery.h b/src/crimson/osd/pg_recovery.h
index 0ba8fda274ccdcaa952d08ad42881f684594999c..afa64dc1e3e824fe60a6bfa0bd9a74ac3b44c7f4 100644 (file)
--- a/src/crimson/osd/pg_recovery.h
+++ b/src/crimson/osd/pg_recovery.h
@@ -5,6 +5,7 @@
 
 #include <seastar/core/future.hh>
 
+#include "crimson/osd/backfill_state.h"
 #include "crimson/osd/osd_operation.h"
 #include "crimson/osd/pg_recovery_listener.h"
 #include "crimson/osd/scheduler/scheduler.h"
@@ -14,7 +15,7 @@
 
 class PGBackend;
 
-class PGRecovery {
+class PGRecovery : public crimson::osd::BackfillState::BackfillListener {
 public:
   PGRecovery(PGRecoveryListener* pg) : pg(pg) {}
   virtual ~PGRecovery() {}
@@ -74,4 +75,26 @@ private:
       Ref<MOSDPGRecoveryDeleteReply> m);
   seastar::future<> handle_pull_response(Ref<MOSDPGPush> m);
   seastar::future<> handle_scan(MOSDPGScan& m);
+
+  // backfill begin
+  void request_replica_scan(
+    const pg_shard_t& target,
+    const hobject_t& begin,
+    const hobject_t& end) final;
+  void request_primary_scan(
+    const hobject_t& begin) final;
+  void enqueue_push(
+    const pg_shard_t& target,
+    const hobject_t& obj,
+    const eversion_t& v) final;
+  void enqueue_drop(
+    const pg_shard_t& target,
+    const hobject_t& obj,
+    const eversion_t& v) final;
+  void update_peers_last_backfill(
+    const hobject_t& new_last_backfill) final;
+  bool budget_available() const final;
+  void backfilled() final;
+  friend crimson::osd::BackfillState::PGFacade;
+  // backfill end
 };