osd: move snap_interval_set_t to osd_types

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

diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 370de67df0d414c14f451fcb7bd958360d28775a..0fc46007d2f130c73dc4797a6915ea71bac6a39e 100644 (file)
--- 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<int64_t,OSDMap::snap_interval_set_t> gap_removed_snaps;
+  mempool::osdmap::map<int64_t,snap_interval_set_t> 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 29c2b08ac14a992f7ebc26b360ca035b780aff68..fc5ed8c57e3ada4ec1001f9e3e644845c95cf3d8 100644 (file)
--- 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<int64_t,OSDMap::snap_interval_set_t> *gap_removed_snaps)
+  mempool::osdmap::map<int64_t,snap_interval_set_t> *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 eb1f4aed6592d8c6ee009e1b950f357c93ae3482..12d005120674e3394878851ba8bcb96aaedc2f3a 100644 (file)
--- 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<int64_t,OSDMap::snap_interval_set_t> *gap_removed_snaps);
+    mempool::osdmap::map<int64_t,snap_interval_set_t> *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 37094119e559ce908df3847d79e46f19503a3df6..31db41aecd7a6e6b4f4acfa8090c6c7fea85d038 100644 (file)
--- 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<snapid_t,snapid_t>> 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 9d3ff29820f1e661c15b940d4f2c1f069173e7ac..ed486f43b12c723d4b30fb5c1831e90415f43ac4 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -137,6 +137,12 @@ typedef std::map<std::string,std::string> osd_alert_list_t;
 typedef std::map<int, osd_alert_list_t> osd_alerts_t;
 void dump(ceph::Formatter* f, const osd_alerts_t& alerts);
 
+
+typedef interval_set<
+  snapid_t,
+  mempool::osdmap::flat_map<snapid_t,snapid_t>> snap_interval_set_t;
+
+
 /**
  * osd request identifier
  *

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 6033f0366786328fc18c32eecb392916c9ca1542..256b2d6918ca11b82d63be7ea412c5b59ea155af 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1036,7 +1036,7 @@ void Objecter::_scan_requests(
   list<LingerOp*>& need_resend_linger,
   map<ceph_tid_t, CommandOp*>& need_resend_command,
   shunique_lock& sul,
-  const mempool::osdmap::map<int64_t,OSDMap::snap_interval_set_t> *gap_removed_snaps)
+  const mempool::osdmap::map<int64_t,snap_interval_set_t> *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<int64_t,
-  OSDMap::snap_interval_set_t>& 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 14819edbd6ac3bbe8fd752de424b6e6ce34a3e39..0d3b6b1e2b28c09d47623c30f5a1a905d1113934 100644 (file)
--- 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<int64_t, OSDMap::snap_interval_set_t>& new_removed_snaps,
+    const mempool::osdmap::map<int64_t, snap_interval_set_t>& new_removed_snaps,
     Op *op);
 
   bool target_should_be_paused(op_target_t *op);
@@ -2144,7 +2145,7 @@ private:
     std::list<LingerOp*>& need_resend_linger,
     std::map<ceph_tid_t, CommandOp*>& need_resend_command,
     shunique_lock& sul,
-    const mempool::osdmap::map<int64_t,OSDMap::snap_interval_set_t> *gap_removed_snaps);
+    const mempool::osdmap::map<int64_t,snap_interval_set_t> *gap_removed_snaps);
 
   int64_t get_object_hash_position(int64_t pool, const std::string& key,
                                   const std::string& ns);