From: Sage Weil <sage@redhat.com>
Date: Thu, 30 May 2019 15:02:19 +0000 (-0500)
Subject: osd/PeeringState: removed pre-mimic removed snap tracking
X-Git-Tag: v15.1.0~2308^2~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e963ee6039a29def026d90100e2ca5454b658649;p=ceph.git

osd/PeeringState: removed pre-mimic removed snap tracking

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9bc4a64523b8..8b462b68e009 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1682,9 +1682,6 @@ void PG::on_active_advmap(const OSDMapRef &osdmap)
 	       << ", now " << recovery_state.get_info().purged_snaps << dendl;
       ceph_assert(!bad || !cct->_conf->osd_debug_verify_cached_snaps);
     }
-  } else if (!pool.newly_removed_snaps.empty()) {
-    snap_trimq.union_of(pool.newly_removed_snaps);
-    dout(10) << " snap_trimq now " << snap_trimq << dendl;
   }
 }
 
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 39e8911467de..ad427502f37a 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -43,11 +43,6 @@ void PGPool::update(CephContext *cct, OSDMapRef map)
   }
 
   assert(map->require_osd_release >= ceph_release_t::mimic);
-  // mimic tracks removed_snaps_queue in the OSDmap and purged_snaps
-  // in the pg_info_t, with deltas for both in each OSDMap.  we don't
-  // need to (and can't) track it here.
-  cached_removed_snaps.clear();
-  newly_removed_snaps.clear();
   if (info.is_pool_snaps_mode() && updated) {
     snapc = pi->get_snap_context();
   }
@@ -2108,21 +2103,14 @@ void PeeringState::activate(
   if (is_primary()) {
     // initialize snap_trimq
     interval_set<snapid_t> to_trim;
-    if (get_osdmap()->require_osd_release < ceph_release_t::mimic) {
-      psdout(20) << "activate - purged_snaps " << info.purged_snaps
-		 << " cached_removed_snaps " << pool.cached_removed_snaps
-		 << dendl;
-      to_trim = pool.cached_removed_snaps;
-    } else {
-      auto& removed_snaps_queue = get_osdmap()->get_removed_snaps_queue();
-      auto p = removed_snaps_queue.find(info.pgid.pgid.pool());
-      if (p != removed_snaps_queue.end()) {
-	dout(20) << "activate - purged_snaps " << info.purged_snaps
-		 << " removed_snaps " << p->second
-		 << dendl;
-	for (auto q : p->second) {
-	  to_trim.insert(q.first, q.second);
-	}
+    auto& removed_snaps_queue = get_osdmap()->get_removed_snaps_queue();
+    auto p = removed_snaps_queue.find(info.pgid.pgid.pool());
+    if (p != removed_snaps_queue.end()) {
+      dout(20) << "activate - purged_snaps " << info.purged_snaps
+	       << " removed_snaps " << p->second
+	       << dendl;
+      for (auto q : p->second) {
+	to_trim.insert(q.first, q.second);
       }
     }
     interval_set<snapid_t> purged;
diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index 2fa5c896a87f..4c30aa93648e 100644
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -34,10 +34,6 @@ struct PGPool {
   pg_pool_t info;
   SnapContext snapc;   // the default pool snapc, ready to go.
 
-  // these two sets are for < mimic only
-  interval_set<snapid_t> cached_removed_snaps;      // current removed_snaps set
-  interval_set<snapid_t> newly_removed_snaps;  // newly removed in the last epoch
-
   PGPool(CephContext* cct, OSDMapRef map, int64_t i, const pg_pool_t& info,
 	 const string& name)
     : cct(cct),