mon/OSDMonitor: do not bother reporting gaps in removed_snaps

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

diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 0fc46007d2f130c73dc4797a6915ea71bac6a39e..41728b7f8bfca36443f6f33385d09e1d41375ccc 100644 (file)
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -32,11 +32,6 @@ public:
   std::map<epoch_t, ceph::buffer::list> incremental_maps;
   epoch_t oldest_map =0, newest_map = 0;
 
-  // 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,snap_interval_set_t> gap_removed_snaps;
-
   epoch_t get_first() const {
     epoch_t e = 0;
     auto i = maps.cbegin();
@@ -86,6 +81,8 @@ public:
       newest_map = 0;
     }
     if (header.version >= 4) {
+      // removed in octopus
+      mempool::osdmap::map<int64_t,snap_interval_set_t> gap_removed_snaps;
       decode(gap_removed_snaps, p);
     }
   }
@@ -150,7 +147,7 @@ public:
       encode(newest_map, payload);
     }
     if (header.version >= 4) {
-      encode(gap_removed_snaps, payload);
+      encode((uint32_t)0, payload);
     }
   }
 
@@ -159,8 +156,6 @@ public:
     out << "osd_map(" << get_first() << ".." << get_last();
     if (oldest_map || newest_map)
       out << " src has " << oldest_map << ".." << newest_map;
-    if (!gap_removed_snaps.empty())
-      out << " +gap_removed_snaps";
     out << ")";
   }
 private:

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 99ec156a1860576a1116396c7aed95134a56b933..fe82df4b769903d45a3fc5a95bc88d213ef5bf48 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3936,9 +3936,6 @@ void OSDMonitor::send_incremental(epoch_t first,
     m->oldest_map = get_first_committed();
     m->newest_map = osdmap.get_epoch();
 
-    // share removed snaps during the gap
-    get_removed_snaps_range(first, m->oldest_map, &m->gap_removed_snaps);
-
     first = get_first_committed();
     bufferlist bl;
     int err = get_version_full(first, features, bl);
@@ -3978,28 +3975,6 @@ void OSDMonitor::send_incremental(epoch_t first,
   }
 }
 
-void OSDMonitor::get_removed_snaps_range(
-  epoch_t start, epoch_t end,
-  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()) {
-    auto& t = (*gap_removed_snaps)[p.first];
-    for (epoch_t epoch = start; epoch < end; ++epoch) {
-      string k = make_removed_snap_epoch_key(p.first, epoch);
-      bufferlist v;
-      mon->store->get(OSD_SNAP_PREFIX, k, v);
-      if (v.length()) {
-       auto q = v.cbegin();
-       snap_interval_set_t snaps;
-       decode(snaps, q);
-       t.union_of(snaps);
-      }
-    }
-    dout(10) << __func__ << " " << p.first << " " << t << dendl;
-  }
-}
-
 int OSDMonitor::get_version(version_t ver, bufferlist& bl)
 {
   return get_version(ver, mon->get_quorum_con_features(), bl);

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 9064effd51a640e4cc57ede82e7348546c70de10..0346aa2cb2b8f8a87d2ec0fc8fd33ae50b240a31 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -726,10 +726,6 @@ public:
     send_incremental(op, start);
   }
 
-  void get_removed_snaps_range(
-    epoch_t start, epoch_t end,
-    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);