crimson: rename WaitForActiveBlocker::on_active

We need to unblock this in cases other than on_active.

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 4b0bdc0c8a9316ce9e75f4158d4348dfb414b83f..5aded130e55711daae7230c09f19daaef1713d35 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -259,7 +259,7 @@ void PG::on_activate(interval_set<snapid_t>)
 
 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 6230f9033888e23b498dbfbdc5de2e3acc35a29a..48ffe3f84134d9ab9cafff2bf38bbbe53fafb7d2 100644 (file)
--- 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 38b64203a89ffea62aaf13767cc6d263c07a7da9..fd07d9b41410b81aebd72e197444af4f972f5537 100644 (file)
--- 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();
 };