From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Oct 2017 18:32:37 +0000 (-0500)
Subject: ceph-objectstore-tool: do not clear same_interval_since and PastIntervals
X-Git-Tag: v13.0.1~634^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f654d0f8d4c2c4761144661ce140af9d7fe90b2;p=ceph.git

ceph-objectstore-tool: do not clear same_interval_since and PastIntervals

We dropped the OSD recalculation code for this.  Import it.

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index cf4b4264395..26e2a89135e 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -1109,10 +1109,6 @@ int get_pg_metadata(ObjectStore *store, bufferlist &bl, metadata_section &ms,
     cerr << "Zero same_interval_since " << ms.info.history.same_interval_since << std::endl;
   }
 
-  // Let osd recompute past_intervals and same_interval_since
-  ms.past_intervals.clear();
-  ms.info.history.same_interval_since =  0;
-
   if (debug)
     cerr << "Changing pg epoch " << ms.map_epoch << " to " << sb.current_epoch << std::endl;