osd/PG: clear past_intervals from update_history

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 997115f4587b31d9f011cc1b45e8e9f172253c26..25fb632aaafc9a11ff5232d255799c601cac27b9 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4898,6 +4898,11 @@ void PG::update_history(const pg_history_t& new_history)
   if (info.history.merge(new_history)) {
     dout(20) << __func__ << " advanced history from " << new_history << dendl;
     dirty_info = true;
+    if (info.history.last_epoch_clean >= info.history.same_interval_since) {
+      dout(20) << __func__ << " clearing past_intervals" << dendl;
+      past_intervals.clear();
+      dirty_big_info = true;
+    }
   }
   reg_next_scrub();
 }