crimson/osd/pg: trigger PG::wait_for_active_blocker only when the pg is

going active Fixes: https://tracker.ceph.com/issues/68541 Signed-off-by: Xuehan Xu <[email protected]>
cybozu · Oct 16, 2024 · 11e3eca · 11e3eca
1 parent 7e7aac1
commit 11e3eca
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
@@ -389,7 +389,13 @@ void PG::on_replica_activate()
 
 void PG::on_activate_complete()
 {
-  wait_for_active_blocker.unblock();
+  /* Confusingly, on_activate_complete is invoked when the primary and replicas
+   * have recorded the current interval.  At that point, the PG may either become
+   * ACTIVE or PEERED, depending on whether the acting set is eligible for client
+   * IO.  Only unblock wait_for_active_blocker if we actually became ACTIVE */
+  if (peering_state.is_active()) {
+    wait_for_active_blocker.unblock();
+  }
 
   if (peering_state.needs_recovery()) {
     logger().info("{}: requesting recovery",