PG::start_peering_interval: use check_new_interval for same_interval_since

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 64d6e45ea2ebcb51a2f4e9870ddbdb0fdfea4878..03f5b6e2780abfcb77f34d06ed62fcc0dd104487 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4686,6 +4686,7 @@ void PG::start_peering_interval(
     dout(10) << " no lastmap" << dendl;
     dirty_info = true;
     dirty_big_info = true;
+    info.history.same_interval_since = osdmap->get_epoch();
   } else {
     std::stringstream debug;
     bool new_interval = pg_interval_t::check_new_interval(
@@ -4709,16 +4710,10 @@ void PG::start_peering_interval(
       dout(10) << " noting past " << past_intervals.rbegin()->second << dendl;
       dirty_info = true;
       dirty_big_info = true;
+      info.history.same_interval_since = osdmap->get_epoch();
     }
   }
 
-  if (old_up_primary != up_primary ||
-      old_acting_primary != primary ||
-      oldacting != acting ||
-      oldup != up ||
-      is_split(lastmap, osdmap)) {
-    info.history.same_interval_since = osdmap->get_epoch();
-  }
   if (old_up_primary != up_primary ||
       oldup != up) {
     info.history.same_up_since = osdmap->get_epoch();