From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 14 Dec 2020 17:54:11 +0000 (+0100)
Subject: crimson/osd: recover_missing() doesn't return std::optional anymore.
X-Git-Tag: v16.1.0~262^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38570%2Fhead;p=ceph.git

crimson/osd: recover_missing() doesn't return std::optional anymore.

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

diff --git a/src/crimson/osd/osd_operations/background_recovery.cc b/src/crimson/osd/osd_operations/background_recovery.cc
index 5a19c71b68d22..126e0e9029bff 100644
--- a/src/crimson/osd/osd_operations/background_recovery.cc
+++ b/src/crimson/osd/osd_operations/background_recovery.cc
@@ -64,9 +64,9 @@ seastar::future<> BackgroundRecovery::start()
 seastar::future<bool> UrgentRecovery::do_recovery()
 {
   if (!pg->has_reset_since(epoch_started)) {
-    auto futopt = pg->get_recovery_handler()->recover_missing(soid, need);
-    assert(futopt);
-    return with_blocking_future(std::move(*futopt)).then([] {
+    return with_blocking_future(
+      pg->get_recovery_handler()->recover_missing(soid, need)
+    ).then([] {
       return seastar::make_ready_future<bool>(false);
     });
   }
diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index 1ef692783e7c2..0eeeee2b82dd7 100644
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -151,13 +151,8 @@ size_t PGRecovery::start_primary_recovery_ops(
       if (pg->get_recovery_backend()->is_recovering(head)) {
 	++skipped;
       } else {
-	auto futopt = recover_missing(soid, item.need);
-	if (futopt) {
-	  out->push_back(std::move(*futopt));
-	  ++started;
-	} else {
-	  ++skipped;
-	}
+	out->push_back(recover_missing(soid, item.need));
+	++started;
       }
     }
 
@@ -257,7 +252,7 @@ size_t PGRecovery::start_replica_recovery_ops(
   return started;
 }
 
-std::optional<crimson::osd::blocking_future<>> PGRecovery::recover_missing(
+crimson::osd::blocking_future<> PGRecovery::recover_missing(
   const hobject_t &soid, eversion_t need)
 {
   if (pg->get_peering_state().get_missing_loc().is_deleted(soid)) {
diff --git a/src/crimson/osd/pg_recovery.h b/src/crimson/osd/pg_recovery.h
index 54f3744bcec1c..86f259de54234 100644
--- a/src/crimson/osd/pg_recovery.h
+++ b/src/crimson/osd/pg_recovery.h
@@ -40,7 +40,7 @@ private:
   std::vector<pg_shard_t> get_replica_recovery_order() const {
     return pg->get_replica_recovery_order();
   }
-  std::optional<crimson::osd::blocking_future<>> recover_missing(
+  crimson::osd::blocking_future<> recover_missing(
     const hobject_t &soid, eversion_t need);
   size_t prep_object_replica_deletes(
     const hobject_t& soid,