osd: queue null events without PG lock

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8e009c6f7ef7e8bc5170d2fdefea22470228b195..2df4556ceb76231ce642b0225458d7a2a0a26748 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4077,7 +4077,7 @@ int OSD::handle_pg_peering_evt(
     }
 
     const bool is_mon_create =
-      evt->get_event().dynamic_type() == PG::NullEvt::static_type();
+      evt->get_event().dynamic_type() == NullEvt::static_type();
     if (maybe_wait_for_max_pg(pgid, is_mon_create)) {
       return -EAGAIN;
     }
@@ -7997,13 +7997,13 @@ void OSD::consume_map()
     for (ceph::unordered_map<spg_t,PG*>::iterator it = pg_map.begin();
         it != pg_map.end();
         ++it) {
-      PG *pg = it->second;
-      if (pg->is_deleted()) {
-       continue;
-      }
-      pg->lock();
-      pg->queue_null(osdmap->get_epoch(), osdmap->get_epoch());
-      pg->unlock();
+      enqueue_peering_evt(
+       it->first,
+       PGPeeringEventRef(
+         std::make_shared<PGPeeringEvent>(
+           osdmap->get_epoch(),
+           osdmap->get_epoch(),
+           NullEvt())));
     }
 
     logger->set(l_osd_pg, pg_map.size());
@@ -8291,10 +8291,10 @@ void OSD::handle_pg_create(OpRequestRef op)
           pi,
           osdmap->get_epoch(),
           PGPeeringEventRef(
-           new PGPeeringEvent(
+           std::make_shared<PGPeeringEvent>(
              osdmap->get_epoch(),
              osdmap->get_epoch(),
-             PG::NullEvt()))
+             NullEvt()))
           ) == -EEXIST) {
       service.send_pg_created(pgid.pgid);
     }

diff --git a/src/osd/PG.h b/src/osd/PG.h
index b516a9a7eaffd432f589b08c92ae1ea0caa59156..7518342a5feb6d4f663f4c4c345123fa94b41668 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1854,9 +1854,6 @@ protected:
   TrivialEvent(Load)
   TrivialEvent(GotInfo)
   TrivialEvent(NeedUpThru)
-  public:
-  TrivialEvent(NullEvt)
-  protected:
   TrivialEvent(Backfilled)
   TrivialEvent(LocalBackfillReserved)
   TrivialEvent(RejectRemoteReservation)

diff --git a/src/osd/PGPeeringEvent.h b/src/osd/PGPeeringEvent.h
index 1ecb7691efdc176da52266417ca47e21967009e4..597da5b729d6511c8a3b539b91f0b482958dacf0 100644 (file)
--- a/src/osd/PGPeeringEvent.h
+++ b/src/osd/PGPeeringEvent.h
@@ -131,6 +131,7 @@ struct RequestRecoveryPrio : boost::statechart::event< RequestRecoveryPrio > {
     }                                                             \
   };
 
+TrivialEvent(NullEvt)
 TrivialEvent(RemoteBackfillReserved)
 TrivialEvent(RemoteReservationRejected)
 TrivialEvent(RemoteReservationRevokedTooFull)