RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

OSD: check for splitting when processing recover/backfill reservations

Browse Source 
Fixes: 6565
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Samuel Just 2013-10-16 10:07:37 -07:00
parent ff8e6a763a
commit 15ec5332ba
1 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/osd/OSD.cc
View File

@ -6397,6 +6397,34 @@ void OSD::handle_pg_backfill_reserve(OpRequestRef op)
if (!require_same_or_newer_map(op, m->query_epoch))
return;
PG::CephPeeringEvtRef evt;
if (m->type == MBackfillReserve::REQUEST) {
evt = PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RequestBackfillPrio(m->priority)));
} else if (m->type == MBackfillReserve::GRANT) {
evt = PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RemoteBackfillReserved()));
} else if (m->type == MBackfillReserve::REJECT) {
evt = PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RemoteReservationRejected()));
} else {
assert(0);
}
if (service.splitting(m->pgid)) {
peering_wait_for_split[m->pgid].push_back(evt);
return;
}
PG *pg = 0;
if (!_have_pg(m->pgid))
return;
@ -6404,30 +6432,7 @@ void OSD::handle_pg_backfill_reserve(OpRequestRef op)
pg = _lookup_lock_pg(m->pgid);
assert(pg);
if (m->type == MBackfillReserve::REQUEST) {
pg->queue_peering_event(
PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RequestBackfillPrio(m->priority))));
} else if (m->type == MBackfillReserve::GRANT) {
pg->queue_peering_event(
PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RemoteBackfillReserved())));
} else if (m->type == MBackfillReserve::REJECT) {
pg->queue_peering_event(
PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RemoteReservationRejected())));
} else {
assert(0);
}
pg->queue_peering_event(evt);
pg->unlock();
}
@ -6441,38 +6446,42 @@ void OSD::handle_pg_recovery_reserve(OpRequestRef op)
if (!require_same_or_newer_map(op, m->query_epoch))
return;
PG::CephPeeringEvtRef evt;
if (m->type == MRecoveryReserve::REQUEST) {
evt = PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RequestRecovery()));
} else if (m->type == MRecoveryReserve::GRANT) {
evt = PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RemoteRecoveryReserved()));
} else if (m->type == MRecoveryReserve::RELEASE) {
evt = PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RecoveryDone()));
} else {
assert(0);
}
if (service.splitting(m->pgid)) {
peering_wait_for_split[m->pgid].push_back(evt);
return;
}
PG *pg = 0;
if (!_have_pg(m->pgid))
return;
pg = _lookup_lock_pg(m->pgid);
if (!pg)
return;
assert(pg);
if (m->type == MRecoveryReserve::REQUEST) {
pg->queue_peering_event(
PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RequestRecovery())));
} else if (m->type == MRecoveryReserve::GRANT) {
pg->queue_peering_event(
PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RemoteRecoveryReserved())));
} else if (m->type == MRecoveryReserve::RELEASE) {
pg->queue_peering_event(
PG::CephPeeringEvtRef(
new PG::CephPeeringEvt(
m->query_epoch,
m->query_epoch,
PG::RecoveryDone())));
} else {
assert(0);
}
pg->queue_peering_event(evt);
pg->unlock();
}