From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Apr 2017 20:00:46 +0000 (-0400)
Subject: osd/PG: clear past_intervals from update_history
X-Git-Tag: v12.0.3~129^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abc615a883423f4240feab7ca2ea05f898811ccc;p=ceph.git

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 997115f4587..25fb632aaaf 100644
--- 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();
 }