From: Sage Weil Date: Mon, 2 Apr 2018 13:56:38 +0000 (-0500) Subject: osd: fix old wake_pg_waiters references X-Git-Tag: v13.1.0~390^2~19 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bfbf2044b2f6da543d21323631d22db67a7e0d39;p=ceph.git osd: fix old wake_pg_waiters references Signed-off-by: Sage Weil --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index ea3f64df129..f0d7ee390fa 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3849,7 +3849,7 @@ void OSD::load_pgs() continue; } - // there can be no waiters here, so we don't call wake_pg_waiters + // there can be no waiters here, so we don't call _wake_pg_slot pg->lock(); pg->ch = store->open_collection(pg->coll); @@ -9690,7 +9690,7 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb) } if (slot->to_process.empty()) { - // raced with wake_pg_waiters or consume_map + // raced with _wake_pg_slot or consume_map dout(20) << __func__ << " " << token << " nothing queued" << dendl; if (pg) { @@ -9702,7 +9702,7 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb) if (requeue_seq != slot->requeue_seq) { dout(20) << __func__ << " " << token << " requeue_seq " << slot->requeue_seq << " > our " - << requeue_seq << ", we raced with wake_pg_waiters" + << requeue_seq << ", we raced with _wake_pg_slot" << dendl; if (pg) { pg->unlock();