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

OSD: _remove_pg not ruin iterator consistency

Browse Source 
Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2012-06-20 18:55:29 -07:00
parent 311a061e0d
commit 87d1cdb5f4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osd/OSD.cc
View File

@ -3579,6 +3579,8 @@ void OSD::activate_map()
epoch_t oldest_last_clean = osdmap->get_epoch();
list<PG*> to_remove;
// scan pg's
for (hash_map<pg_t,PG*>::iterator it = pg_map.begin();
it != pg_map.end();
@ -3598,9 +3600,8 @@ void OSD::activate_map()
if (!osdmap->have_pg_pool(pg->info.pgid.pool())) {
//pool is deleted!
pg->get();
_remove_pg(pg);
to_remove.push_back(pg);
pg->unlock();
pg->put();
continue;
} else {
pg->queue_null(osdmap->get_epoch(), osdmap->get_epoch());
@ -3608,6 +3609,16 @@ void OSD::activate_map()
pg->unlock();
}
for (list<PG*>::iterator i = to_remove.begin();
i != to_remove.end();
++i) {
(*i)->lock();
_remove_pg((*i));
(*i)->unlock();
(*i)->put();
}
logger->set(l_osd_pg, pg_map.size());
logger->set(l_osd_pg_primary, num_pg_primary);
logger->set(l_osd_pg_replica, num_pg_replica);