RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: queue peering events directly, without pg lookup

Browse Source 
We do not need to look up the PG in order to queue a peering event now
that the queue is based on spg_t and handles the validity checks (based on
the epoch) for us.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-12-12 09:29:15 -06:00
parent 4a45a4d568
commit e5a56d4238
1 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/osd/OSD.cc
View File

@ -3824,7 +3824,7 @@ void OSD::add_newly_split_pg(PG *pg, PG::RecoveryCtx *rctx)
to_wake->second.begin();
i != to_wake->second.end();
++i) {
pg->queue_peering_event(*i);
enqueue_peering_evt(pg->get_pgid(), *i);
}
peering_wait_for_split.erase(to_wake);
}
@ -4077,20 +4077,13 @@ int OSD::handle_pg_peering_evt(
dispatch_context(rctx, pg, osdmap);
dout(10) << *pg << " is new" << dendl;
pg->queue_peering_event(evt);
enqueue_peering_evt(pg->get_pgid(), evt);
wake_pg_waiters(pg);
pg->unlock();
return 0;
} else {
// already had it. did the mapping change?
if (epoch < pg->get_same_interval_since()) {
dout(10) << *pg << __func__ << " acting changed in "
<< pg->get_same_interval_since()
<< " (msg from " << epoch << ")" << dendl;
} else {
pg->queue_peering_event(evt);
}
// already had it
enqueue_peering_evt(pg->get_pgid(), evt);
pg->unlock();
return -EEXIST;
}
@ -8485,19 +8478,7 @@ void OSD::handle_pg_backfill_reserve(OpRequestRef op)
ceph_abort();
}
if (service.splitting(m->pgid)) {
peering_wait_for_split[m->pgid].push_back(evt);
return;
}
PG *pg = _lookup_lock_pg(m->pgid);
if (!pg) {
dout(10) << " don't have pg " << m->pgid << dendl;
return;
}
pg->queue_peering_event(evt);
pg->unlock();
enqueue_peering_evt(m->pgid, evt);
}
void OSD::handle_pg_recovery_reserve(OpRequestRef op)
@ -8539,19 +8520,7 @@ void OSD::handle_pg_recovery_reserve(OpRequestRef op)
ceph_abort();
}
if (service.splitting(m->pgid)) {
peering_wait_for_split[m->pgid].push_back(evt);
return;
}
PG *pg = _lookup_lock_pg(m->pgid);
if (!pg) {
dout(10) << " don't have pg " << m->pgid << dendl;
return;
}
pg->queue_peering_event(evt);
pg->unlock();
enqueue_peering_evt(m->pgid, evt);
}
void OSD::handle_force_recovery(Message *m)
@ -8716,17 +8685,12 @@ void OSD::handle_pg_remove(OpRequestRef op)
continue;
}
PG *pg = _lookup_lock_pg(pgid);
if (pg) {
pg->queue_peering_event(
PGPeeringEventRef(
new PGPeeringEvent(
m->get_epoch(), m->get_epoch(),
PG::DeleteStart())));
pg->unlock();
} else {
dout(10) << " don't have pg " << pgid << dendl;
}
enqueue_peering_evt(
pgid,
PGPeeringEventRef(
new PGPeeringEvent(
m->get_epoch(), m->get_epoch(),
PG::DeleteStart())));
}
}