crimson/osd: crimson/osd: drop blocking_future from PGMap

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

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 6640f502c655015f04b73fecbd0f97a0a544709f..2c88f5a5de02f23364376c11e07cbd3e379999cc 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -1412,24 +1412,6 @@ seastar::future<> OSD::consume_map(epoch_t epoch)
 }
 
 
-blocking_future<Ref<PG>>
-OSD::get_or_create_pg(
-  spg_t pgid,
-  epoch_t epoch,
-  std::unique_ptr<PGCreateInfo> info)
-{
-  if (info) {
-    auto [fut, creating] = pg_map.wait_for_pg(pgid);
-    if (!creating) {
-      pg_map.set_creating(pgid);
-      (void)handle_pg_create_info(std::move(info));
-    }
-    return std::move(fut);
-  } else {
-    return make_ready_blocking_future<Ref<PG>>(pg_map.get_pg(pgid));
-  }
-}
-
 seastar::future<Ref<PG>>
 OSD::get_or_create_pg(
   PGMap::PGCreationBlockingEvent::TriggerI&& trigger,
@@ -1449,12 +1431,6 @@ OSD::get_or_create_pg(
   }
 }
 
-blocking_future<Ref<PG>> OSD::wait_for_pg(
-  spg_t pgid)
-{
-  return pg_map.wait_for_pg(pgid).first;
-}
-
 seastar::future<Ref<PG>> OSD::wait_for_pg(
   PGMap::PGCreationBlockingEvent::TriggerI&& trigger, spg_t pgid)
 {

diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h
index 9b4c9c8dc579804e5c9bdf09a9d49d684237f22a..ae0ac9bc0e5947b14e37cd9c7ef89a69cd97f105 100644 (file)
--- a/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@ -236,17 +236,11 @@ private:
   friend class RemotePeeringEvent;
 
 public:
-  blocking_future<Ref<PG>> get_or_create_pg(
-    spg_t pgid,
-    epoch_t epoch,
-    std::unique_ptr<PGCreateInfo> info);
   seastar::future<Ref<PG>> get_or_create_pg(
     PGMap::PGCreationBlockingEvent::TriggerI&&,
     spg_t pgid,
     epoch_t epoch,
     std::unique_ptr<PGCreateInfo> info);
-  blocking_future<Ref<PG>> wait_for_pg(
-    spg_t pgid);
   seastar::future<Ref<PG>> wait_for_pg(
     PGMap::PGCreationBlockingEvent::TriggerI&&, spg_t pgid);
   Ref<PG> get_pg(spg_t pgid);

diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc
index 6c8d5754c4ce69b04027a6522b49242355a0c848..d291419dd37d5e90777a73dbba69f2826f5473a9 100644 (file)
--- a/src/crimson/osd/pg_map.cc
+++ b/src/crimson/osd/pg_map.cc
@@ -25,18 +25,6 @@ void PGMap::PGCreationState::dump_detail(Formatter *f) const
   f->dump_bool("creating", creating);
 }
 
-std::pair<blocking_future<Ref<PG>>, bool> PGMap::wait_for_pg(spg_t pgid)
-{
-  if (auto pg = get_pg(pgid)) {
-    return make_pair(make_ready_blocking_future<Ref<PG>>(pg), true);
-  } else {
-    auto &state = pgs_creating.emplace(pgid, pgid).first->second;
-    return make_pair(
-      state.make_blocking_future(state.promise.get_shared_future()),
-      state.creating);
-  }
-}
-
 std::pair<seastar::future<Ref<PG>>, bool>
 PGMap::wait_for_pg(PGCreationBlockingEvent::TriggerI&& trigger, spg_t pgid)
 {

diff --git a/src/crimson/osd/pg_map.h b/src/crimson/osd/pg_map.h
index 1a06ee5c22e103fd4c8137c060ba48f22c28cff8..c4bd5878a0a90b9f8d52d75558fb862f56d12edb 100644 (file)
--- a/src/crimson/osd/pg_map.h
+++ b/src/crimson/osd/pg_map.h
@@ -46,7 +46,6 @@ public:
    * Get future for pg with a bool indicating whether it's already being
    * created.
    */
-  std::pair<blocking_future<Ref<PG>>, bool> wait_for_pg(spg_t pgid);
   std::pair<seastar::future<Ref<PG>>, bool>
   wait_for_pg(PGCreationBlockingEvent::TriggerI&&, spg_t pgid);