From 0830275b39afc408573c2c468fa3b0e7b1d5cc4e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 6 Oct 2015 14:35:35 -0400 Subject: [PATCH] osd/PG: fix generate_past_intervals We may be only calculating older past intervals and have a valid history.same_interval_since value, in which case the local same_interval_since value will end at the newest old interval we had to generate. This was introduced by 70316541bbb115d9a35954bfba373cf1dc084b7e. Signed-off-by: Sage Weil (cherry picked from commit 98cbf0380e9ee848725fc87d61c31a734305a84f) --- src/osd/PG.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b53c125693e3..7917638b1e72 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -749,10 +749,8 @@ void PG::generate_past_intervals() } } - // Verify same_interval_since is correct - if (info.history.same_interval_since) { - assert(info.history.same_interval_since == same_interval_since); - } else { + // PG import needs recalculated same_interval_since + if (info.history.same_interval_since == 0) { assert(same_interval_since); dout(10) << __func__ << " fix same_interval_since " << same_interval_since << " pg " << *this << dendl; dout(10) << __func__ << " past_intervals " << past_intervals << dendl; -- 2.47.3