From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Dec 2017 15:23:54 +0000 (-0600)
Subject: osd: enqueue peering evt with pgid, not PG*
X-Git-Tag: v13.0.2~510^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2914e409ca5009dbc38ce80de5fc584249466b44;p=ceph.git

osd: enqueue peering evt with pgid, not PG*

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f93da77c374..5ccdbf2030d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8959,12 +8959,12 @@ void OSD::enqueue_op(spg_t pg, OpRequestRef& op, epoch_t epoch)
       epoch));
 }
 
-void OSD::enqueue_peering_evt(PG *pg, PGPeeringEventRef evt)
+void OSD::enqueue_peering_evt(spg_t pgid, PGPeeringEventRef evt)
 {
-  dout(15) << __func__ << " " << pg->get_pgid() << " " << evt->get_desc() << dendl;
+  dout(15) << __func__ << " " << pgid << " " << evt->get_desc() << dendl;
   op_shardedwq.queue(
     OpQueueItem(
-      unique_ptr<OpQueueItem::OpQueueable>(new PGPeeringItem(pg->get_pgid(), evt)),
+      unique_ptr<OpQueueItem::OpQueueable>(new PGPeeringItem(pgid, evt)),
       10,
       cct->_conf->osd_peering_op_priority,
       utime_t(),
@@ -8972,12 +8972,12 @@ void OSD::enqueue_peering_evt(PG *pg, PGPeeringEventRef evt)
       evt->get_epoch_sent()));
 }
 
-void OSD::enqueue_peering_evt_front(PG *pg, PGPeeringEventRef evt)
+void OSD::enqueue_peering_evt_front(spg_t pgid, PGPeeringEventRef evt)
 {
-  dout(15) << __func__ << " " << pg->get_pgid() << " " << evt->get_desc() << dendl;
+  dout(15) << __func__ << " " << pgid << " " << evt->get_desc() << dendl;
   op_shardedwq.queue_front(
     OpQueueItem(
-      unique_ptr<OpQueueItem::OpQueueable>(new PGPeeringItem(pg->get_pgid(), evt)),
+      unique_ptr<OpQueueItem::OpQueueable>(new PGPeeringItem(pgid, evt)),
       10,
       cct->_conf->osd_peering_op_priority,
       utime_t(),
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 914c4a312d8..3a22bdda35e 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1732,10 +1732,10 @@ private:
     ThreadPool::TPHandle &handle);
 
   void enqueue_peering_evt(
-    PG *pg,
+    spg_t pgid,
     PGPeeringEventRef ref);
   void enqueue_peering_evt_front(
-    PG *pg,
+    spg_t pgid,
     PGPeeringEventRef ref);
   void dequeue_peering_evt(
     PG *pg,
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index d1b82bbd87d..bca148e3fdb 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5857,7 +5857,7 @@ void PG::take_waiters()
   for (auto i = peering_waiters.rbegin();
        i != peering_waiters.rend();
        ++i) {
-    osd->osd->enqueue_peering_evt_front(this, *i);
+    osd->osd->enqueue_peering_evt_front(info.pgid, *i);
   }
 }
 
@@ -5879,7 +5879,7 @@ void PG::queue_peering_event(PGPeeringEventRef evt)
 {
   if (old_peering_evt(evt))
     return;
-  osd->osd->enqueue_peering_evt(this, evt);
+  osd->osd->enqueue_peering_evt(info.pgid, evt);
 }
 
 void PG::queue_null(epoch_t msg_epoch,