diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-05-10 16:44:19 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-05-10 16:45:34 -0700 |
| commit | ea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04 (patch) | |
| tree | 2df957c71bf1d6f13b8fc0f1bbb9244e11e27048 /src/osd/OSD.cc | |
| parent | 7b408537c4986153a54dc090f8872f72904f5d4d (diff) | |
| parent | 00e903160b33fe0a2195fe9c86ed24350944bdea (diff) | |
| download | ceph-ea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04.tar.gz | |
Merge branch 'wip-4273'
Reviewed-by: Sam Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/OSD.cc')
| -rw-r--r-- | src/osd/OSD.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index f53dd695544..65687429894 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -5791,7 +5791,7 @@ void OSD::handle_pg_backfill_reserve(OpRequestRef op) new PG::CephPeeringEvt( m->query_epoch, m->query_epoch, - PG::RequestBackfill()))); + PG::RequestBackfillPrio(m->priority)))); } else if (m->type == MBackfillReserve::GRANT) { pg->queue_peering_event( PG::CephPeeringEvtRef( @@ -6195,15 +6195,6 @@ void OSD::finish_recovery_op(PG *pg, const hobject_t& soid, bool dequeue) recovery_wq.unlock(); } -void OSD::defer_recovery(PG *pg) -{ - dout(10) << "defer_recovery " << *pg << dendl; - - // move pg to the end of the queue... - recovery_wq.queue(pg); -} - - // ========================================================= // OPS |