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/PG: tolerate missing pool

Browse Source 
These assertions will soon no longer be valid.

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

3
src/osd/OSD.cc
View File

@ -7900,7 +7900,8 @@ void OSD::advance_pg(
// Check for split!
set<spg_t> children;
spg_t parent(pg->pg_id);
if (parent.is_split(
if (nextmap->have_pg_pool(pg->pg_id.pool()) &&
parent.is_split(
lastmap->get_pg_num(pg->pg_id.pool()),
nextmap->get_pg_num(pg->pg_id.pool()),
&children)) {

11
src/osd/PG.cc
View File

@ -227,7 +227,9 @@ void PG::dump_live_ids()
void PGPool::update(CephContext *cct, OSDMapRef map)
{
const pg_pool_t *pi = map->get_pg_pool(id);
assert(pi);
if (!pi) {
return; // pool has been deleted
}
info = *pi;
auid = pi->auid;
name = map->get_pool_name(id);
@ -5253,7 +5255,9 @@ void PG::check_full_transition(OSDMapRef lastmap, OSDMapRef osdmap)
changed = true;
}
const pg_pool_t *pi = osdmap->get_pg_pool(info.pgid.pool());
assert(pi);
if (!pi) {
return; // pool deleted
}
if (pi->has_flag(pg_pool_t::FLAG_FULL)) {
const pg_pool_t *opi = lastmap->get_pg_pool(info.pgid.pool());
if (!opi || !opi->has_flag(pg_pool_t::FLAG_FULL)) {
@ -5455,7 +5459,8 @@ void PG::start_peering_interval(
dirty_info = true;
dirty_big_info = true;
info.history.same_interval_since = osdmap->get_epoch();
if (info.pgid.pgid.is_split(lastmap->get_pg_num(info.pgid.pgid.pool()),
if (osdmap->have_pg_pool(info.pgid.pgid.pool()) &&
info.pgid.pgid.is_split(lastmap->get_pg_num(info.pgid.pgid.pool()),
osdmap->get_pg_num(info.pgid.pgid.pool()),
nullptr)) {
info.history.last_epoch_split = osdmap->get_epoch();