From: Kefu Chai <kchai@redhat.com>
Date: Mon, 14 Dec 2020 14:49:55 +0000 (+0800)
Subject: crimson/osd: do not return unused value
X-Git-Tag: v16.1.0~263^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da3eba87955564cfd427320b71553f97931ef47f;p=ceph.git

crimson/osd: do not return unused value

do not return a bool from
`ReplicatedRecoveryBackend::maybe_pull_missing_obj()` anymore, as the
caller does not check it at all.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 89d6db2f32c..9c46d9391a2 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -29,7 +29,7 @@ seastar::future<> ReplicatedRecoveryBackend::recover_object(
   return seastar::do_with(std::map<pg_shard_t, PushOp>(), get_shards_to_push(soid),
     [this, soid, need](auto& pops, auto& shards) {
     return maybe_pull_missing_obj(soid, need).then(
-      [this, soid, need, &pops, &shards](bool pulled) {
+      [this, soid, need, &pops, &shards] {
       return maybe_push_shards(soid, need, pops, shards);
     });
   });
@@ -105,14 +105,14 @@ ReplicatedRecoveryBackend::maybe_push_shards(
   }));
 }
 
-seastar::future<bool>
+seastar::future<>
 ReplicatedRecoveryBackend::maybe_pull_missing_obj(
   const hobject_t& soid,
   eversion_t need)
 {
   pg_missing_tracker_t local_missing = pg.get_local_missing();
   if (!local_missing.is_missing(soid)) {
-    return seastar::make_ready_future<bool>(false);
+    return seastar::make_ready_future<>();
   }
   PullOp po;
   auto& recovery_waiter = recovering.at(soid);
@@ -132,8 +132,6 @@ ReplicatedRecoveryBackend::maybe_pull_missing_obj(
     pg.get_osdmap_epoch()
   ).then([&recovery_waiter] {
     return recovery_waiter.wait_for_pull();
-  }).then([] {
-    return seastar::make_ready_future<bool>(true);
   });
 }
 
diff --git a/src/crimson/osd/replicated_recovery_backend.h b/src/crimson/osd/replicated_recovery_backend.h
index aff0f500c85..bc39eb8e48f 100644
--- a/src/crimson/osd/replicated_recovery_backend.h
+++ b/src/crimson/osd/replicated_recovery_backend.h
@@ -110,9 +110,7 @@ protected:
   }
 private:
   /// pull missing object from peer
-  ///
-  /// @return true if the object is pulled, false otherwise
-  seastar::future<bool> maybe_pull_missing_obj(
+  seastar::future<> maybe_pull_missing_obj(
     const hobject_t& soid,
     eversion_t need);