From 65dcc2da76750d0b6dd2cf0031c44f32749f33e5 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 20 Jul 2015 17:48:15 -0700 Subject: [PATCH] osd: When generating past intervals due to an import end at pg epoch Add assert() to make sure same_interval_since isn't too far forward Fixes: #12387 Signed-off-by: David Zafman --- src/osd/PG.cc | 2 +- src/osd/osd_types.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b53370f8c38d..edf91721be80 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -647,7 +647,7 @@ bool PG::_calc_past_interval_range(epoch_t *start, epoch_t *end, epoch_t oldest_ *end = info.history.same_interval_since; } else { // PG must be imported, so let's calculate the whole range. - *end = osd->get_superblock().newest_map; + *end = osdmap_ref->get_epoch(); } // Do we already have the intervals we want? diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 4bc95e4dd185..bec9f0ded6b3 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -2652,6 +2652,7 @@ bool pg_interval_t::check_new_interval( pg_interval_t& i = (*past_intervals)[same_interval_since]; i.first = same_interval_since; i.last = osdmap->get_epoch() - 1; + assert(i.first <= i.last); i.acting = old_acting; i.up = old_up; i.primary = old_acting_primary; -- 2.47.3