From 58c4c8fc8ef9f85c3efdd31740f2a91054258b08 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Jun 2019 13:14:07 -0500 Subject: [PATCH] osd: move snap_interval_set_t to osd_types Signed-off-by: Sage Weil --- src/messages/MOSDMap.h | 2 +- src/mon/OSDMonitor.cc | 8 ++++---- src/mon/OSDMonitor.h | 2 +- src/osd/OSDMap.h | 4 ---- src/osd/osd_types.h | 6 ++++++ src/osdc/Objecter.cc | 4 ++-- src/osdc/Objecter.h | 7 ++++--- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index 370de67df0d..0fc46007d2f 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -35,7 +35,7 @@ public: // if we are fetching maps from the mon and have to jump a gap // (client's next needed std::map is older than mon's oldest) we can // share removed snaps from the gap here. - mempool::osdmap::map gap_removed_snaps; + mempool::osdmap::map gap_removed_snaps; epoch_t get_first() const { epoch_t e = 0; diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 29c2b08ac14..fc5ed8c57e3 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3819,7 +3819,7 @@ void OSDMonitor::send_incremental(epoch_t first, void OSDMonitor::get_removed_snaps_range( epoch_t start, epoch_t end, - mempool::osdmap::map *gap_removed_snaps) + mempool::osdmap::map *gap_removed_snaps) { // we only care about pools that exist now. for (auto& p : osdmap.get_pools()) { @@ -3830,7 +3830,7 @@ void OSDMonitor::get_removed_snaps_range( mon->store->get(OSD_SNAP_PREFIX, k, v); if (v.length()) { auto q = v.cbegin(); - OSDMap::snap_interval_set_t snaps; + snap_interval_set_t snaps; decode(snaps, q); t.union_of(snaps); } @@ -6251,7 +6251,7 @@ bool OSDMonitor::try_prune_purged_snaps() continue; } dout(20) << __func__ << " pool " << p.first << " purged " << purged << dendl; - OSDMap::snap_interval_set_t to_prune; + snap_interval_set_t to_prune; unsigned maybe_pruned = actually_pruned; for (auto i = purged.begin(); i != purged.end(); ++i) { snapid_t begin = i.get_start(); @@ -6282,7 +6282,7 @@ bool OSDMonitor::try_prune_purged_snaps() if (!to_prune.empty()) { // PGs may still be reporting things as purged that we have already // pruned from removed_snaps_queue. - OSDMap::snap_interval_set_t actual; + snap_interval_set_t actual; auto r = osdmap.removed_snaps_queue.find(p.first); if (r != osdmap.removed_snaps_queue.end()) { actual.intersection_of(to_prune, r->second); diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index eb1f4aed659..12d00512067 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -693,7 +693,7 @@ public: void get_removed_snaps_range( epoch_t start, epoch_t end, - mempool::osdmap::map *gap_removed_snaps); + mempool::osdmap::map *gap_removed_snaps); int get_version(version_t ver, bufferlist& bl) override; int get_version(version_t ver, uint64_t feature, bufferlist& bl); diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 37094119e55..31db41aecd7 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -349,10 +349,6 @@ class OSDMap { public: MEMPOOL_CLASS_HELPERS(); - typedef interval_set< - snapid_t, - mempool::osdmap::flat_map> snap_interval_set_t; - class Incremental { public: MEMPOOL_CLASS_HELPERS(); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 9d3ff29820f..ed486f43b12 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -137,6 +137,12 @@ typedef std::map osd_alert_list_t; typedef std::map osd_alerts_t; void dump(ceph::Formatter* f, const osd_alerts_t& alerts); + +typedef interval_set< + snapid_t, + mempool::osdmap::flat_map> snap_interval_set_t; + + /** * osd request identifier * diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 6033f036678..256b2d6918c 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1036,7 +1036,7 @@ void Objecter::_scan_requests( list& need_resend_linger, map& need_resend_command, shunique_lock& sul, - const mempool::osdmap::map *gap_removed_snaps) + const mempool::osdmap::map *gap_removed_snaps) { ceph_assert(sul.owns_lock() && sul.mutex() == &rwlock); @@ -2767,7 +2767,7 @@ int64_t Objecter::get_object_pg_hash_position(int64_t pool, const string& key, void Objecter::_prune_snapc( const mempool::osdmap::map& new_removed_snaps, + snap_interval_set_t>& new_removed_snaps, Op *op) { bool match = false; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 14819edbd6a..0d3b6b1e2b2 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -41,7 +41,8 @@ #include "messages/MOSDOp.h" #include "msg/Dispatcher.h" -#include "osd/OSDMap.h" // for OSDMap::snap_interval_set_t + +#include "osd/OSDMap.h" class Context; class Messenger; @@ -1997,7 +1998,7 @@ public: bool _osdmap_full_flag() const; bool _osdmap_has_pool_full() const; void _prune_snapc( - const mempool::osdmap::map& new_removed_snaps, + const mempool::osdmap::map& new_removed_snaps, Op *op); bool target_should_be_paused(op_target_t *op); @@ -2144,7 +2145,7 @@ private: std::list& need_resend_linger, std::map& need_resend_command, shunique_lock& sul, - const mempool::osdmap::map *gap_removed_snaps); + const mempool::osdmap::map *gap_removed_snaps); int64_t get_object_hash_position(int64_t pool, const std::string& key, const std::string& ns); -- 2.39.5