From d41f37c8bd564eee547e8ab216ab50c929afb04e Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 25 Apr 2022 16:32:11 -0700 Subject: [PATCH] crimson: rename WaitForActiveBlocker::on_active We need to unblock this in cases other than on_active. Signed-off-by: Samuel Just --- src/crimson/osd/pg.cc | 2 +- src/crimson/osd/pg_activation_blocker.cc | 2 +- src/crimson/osd/pg_activation_blocker.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 4b0bdc0c8a931..5aded130e5571 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -259,7 +259,7 @@ void PG::on_activate(interval_set) void PG::on_activate_complete() { - wait_for_active_blocker.on_active(); + wait_for_active_blocker.unblock(); if (peering_state.needs_recovery()) { logger().info("{}: requesting recovery", diff --git a/src/crimson/osd/pg_activation_blocker.cc b/src/crimson/osd/pg_activation_blocker.cc index 6230f9033888e..48ffe3f84134d 100644 --- a/src/crimson/osd/pg_activation_blocker.cc +++ b/src/crimson/osd/pg_activation_blocker.cc @@ -11,7 +11,7 @@ void PGActivationBlocker::dump_detail(Formatter *f) const f->dump_stream("pgid") << pg->get_pgid(); } -void PGActivationBlocker::on_active() +void PGActivationBlocker::unblock() { p.set_value(); p = {}; diff --git a/src/crimson/osd/pg_activation_blocker.h b/src/crimson/osd/pg_activation_blocker.h index 38b64203a89ff..fd07d9b41410b 100644 --- a/src/crimson/osd/pg_activation_blocker.h +++ b/src/crimson/osd/pg_activation_blocker.h @@ -26,7 +26,7 @@ public: static constexpr const char *type_name = "PGActivationBlocker"; PGActivationBlocker(PG *pg) : pg(pg) {} - void on_active(); + void unblock(); seastar::future<> wait(PGActivationBlocker::BlockingEvent::TriggerI&&); seastar::future<> stop(); }; -- 2.39.5