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

osd: prime pg_slots for to-be-split children

Browse Source 
Once we know which PGs are about to be created, we instantiate their
pg_slot and mark them waiting_pg, which blocks all incoming events until
the split completes, the PG is installed, and we call wake_pg_waiters().

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-01-03 11:48:37 -06:00
parent 718b6baa3c
commit ae210722b4
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osd/OSD.cc
View File

@ -8149,6 +8149,9 @@ void OSD::split_pgs(
OSDMapRef nextmap,
PG::RecoveryCtx *rctx)
{
// make sure to-be-split children are blocked in wq
op_shardedwq.prime_splits(childpgids);
unsigned pg_num = nextmap->get_pg_num(
parent->pg_id.pool());
parent->update_snap_mapper_bits(
@ -9477,6 +9480,18 @@ void OSD::ShardedOpWQ::wake_pg_waiters(spg_t pgid)
}
}
void OSD::ShardedOpWQ::prime_splits(const set<spg_t>& pgs)
{
dout(20) << __func__ << " " << pgs << dendl;
for (auto pgid : pgs) {
unsigned shard_index = pgid.hash_to_shard(shard_list.size());
ShardData* sdata = shard_list[shard_index];
Mutex::Locker l(sdata->sdata_op_ordering_lock);
ShardData::pg_slot& slot = sdata->pg_slots[pgid];
slot.waiting_for_pg = true;
}
}
void OSD::ShardedOpWQ::prune_pg_waiters(OSDMapRef osdmap, int whoami)
{
unsigned pushes_to_free = 0;

3
src/osd/OSD.h
View File

@ -1680,6 +1680,9 @@ private:
void _wake_pg_slot(spg_t pgid, ShardData *sdata, ShardData::pg_slot& slot,
unsigned *pushes_to_free);
/// prime slots for splitting pgs
void prime_splits(const set<spg_t>& pgs);
/// prune ops (and possibly pg_slots) for pgs that shouldn't be here
void prune_pg_waiters(OSDMapRef osdmap, int whoami);