From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Oct 2015 18:35:35 +0000 (-0400)
Subject: osd/PG: fix generate_past_intervals
X-Git-Tag: v9.1.0~24^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=98cbf0380e9ee848725fc87d61c31a734305a84f;p=ceph.git

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 <sage@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c475b9621a82b..b5a743bf3f8da 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -753,10 +753,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;