From 2914e409ca5009dbc38ce80de5fc584249466b44 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Dec 2017 09:23:54 -0600 Subject: [PATCH] osd: enqueue peering evt with pgid, not PG* Signed-off-by: Sage Weil --- src/osd/OSD.cc | 12 ++++++------ src/osd/OSD.h | 4 ++-- src/osd/PG.cc | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index f93da77c3742d..5ccdbf2030d21 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(new PGPeeringItem(pg->get_pgid(), evt)), + unique_ptr(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(new PGPeeringItem(pg->get_pgid(), evt)), + unique_ptr(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 914c4a312d8aa..3a22bdda35ea1 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 d1b82bbd87df4..bca148e3fdb7f 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, -- 2.39.5