osd/: simply requeue_map_waiters in handle_activate, remove take_waiters

This seems clearer.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 79a870c9cd72d073cde02338de423fcca8326f3d..a579167340a49f91fd2e7f7dc011c09869856b75 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6047,12 +6047,6 @@ bool PG::can_discard_request(OpRequestRef& op)
   return true;
 }
 
-void PG::take_waiters()
-{
-  dout(10) << "take_waiters" << dendl;
-  requeue_map_waiters();
-}
-
 void PG::do_peering_event(PGPeeringEventRef evt, PeeringCtx *rctx)
 {
   dout(10) << __func__ << ": " << evt->get_desc() << dendl;
@@ -6143,6 +6137,8 @@ void PG::handle_activate_map(PeeringCtx *rctx)
   dout(10) << __func__ << ": " << get_osdmap()->get_epoch()
           << dendl;
   recovery_state.activate_map(rctx);
+
+  requeue_map_waiters();
 }
 
 void PG::handle_initialize(PeeringCtx *rctx)

diff --git a/src/osd/PG.h b/src/osd/PG.h
index fcd27758b1f2f5e47e2e4a2a2acf0fec7a9ab79a..8c61d4f002ac02798c68e63c6e3193697aa85c0f 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1638,11 +1638,6 @@ protected:
 
   bool op_has_sufficient_caps(OpRequestRef& op);
 
-
-  // recovery bits
-  void take_waiters();
-
-
   // abstract bits
   friend class FlushState;
 

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 3977b61268113f6ded96ad532c6f6563e7b6b169..18a38ee4485ea4913e83e682a0dcfc78ecc52b28 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -972,7 +972,6 @@ boost::statechart::result PeeringState::Reset::react(const ActMap&)
   }
 
   ps->update_heartbeat_peers();
-  pg->take_waiters();
 
   return transit< Started >();
 }
@@ -1062,7 +1061,6 @@ boost::statechart::result PeeringState::Primary::react(const ActMap&)
   PG *pg = context< PeeringMachine >().pg;
   psdout(7) << "handle ActMap primary" << dendl;
   pg->publish_stats_to_osd();
-  pg->take_waiters();
   return discard_event();
 }
 
@@ -2627,7 +2625,6 @@ boost::statechart::result PeeringState::ReplicaActive::react(const ActMap&)
        pg->info),
       pg->past_intervals);
   }
-  pg->take_waiters();
   return discard_event();
 }
 
@@ -2749,7 +2746,6 @@ boost::statechart::result PeeringState::Stray::react(const ActMap&)
        pg->info),
       pg->past_intervals);
   }
-  pg->take_waiters();
   return discard_event();
 }