osd: drop snap_collections

This is obsolete since cuttlefish.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 9cdc7f8f3d41aea141ab445503e1dc87f23411bc..d32e4a87e29141dde546a12e8046afdf2e36bb01 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2810,15 +2810,6 @@ void OSD::load_pgs()
       }
     }
 
-    if (!pg->snap_collections.empty()) {
-      pg->snap_collections.clear();
-      pg->dirty_big_info = true;
-      pg->dirty_info = true;
-      ObjectStore::Transaction t;
-      pg->write_if_dirty(t);
-      store->apply_transaction(t);
-    }
-
     service.init_splits_between(pg->info.pgid, pg->get_osdmap(), osdmap);
 
     // generate state for PG's current mapping

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3ef6eacff362b1e74774816a6a7fb88a82789740..7e63bb44ef0da0710416373df56192a4d142204e 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2626,13 +2626,11 @@ void PG::_upgrade_v7(ObjectStore *store, const interval_set<snapid_t> &snapcolls
     }
     objects.clear();
   }
-  snap_collections.clear();
 }
 
 int PG::_write_info(ObjectStore::Transaction& t, epoch_t epoch,
                    pg_info_t &info, coll_t coll,
                    map<epoch_t,pg_interval_t> &past_intervals,
-                   interval_set<snapid_t> &snap_collections,
                    ghobject_t &pgmeta_oid,
                    bool dirty_big_info)
 {
@@ -2650,7 +2648,6 @@ int PG::_write_info(ObjectStore::Transaction& t, epoch_t epoch,
     // potentially big stuff
     bufferlist& bigbl = v[biginfo_key];
     ::encode(past_intervals, bigbl);
-    ::encode(snap_collections, bigbl);
     ::encode(info.purged_snaps, bigbl);
     //dout(20) << "write_info bigbl " << bigbl.length() << dendl;
   }
@@ -2695,7 +2692,7 @@ void PG::write_info(ObjectStore::Transaction& t)
   unstable_stats.clear();
 
   int ret = _write_info(t, get_osdmap()->get_epoch(), info, coll,
-                       past_intervals, snap_collections, pgmeta_oid,
+                       past_intervals, pgmeta_oid,
                        dirty_big_info);
   assert(ret == 0);
   last_persisted_osdmap_ref = osdmap_ref;
@@ -2928,7 +2925,7 @@ std::string PG::get_corrupt_pg_log_name() const
 int PG::read_info(
   ObjectStore *store, spg_t pgid, const coll_t &coll, bufferlist &bl,
   pg_info_t &info, map<epoch_t,pg_interval_t> &past_intervals,
-  interval_set<snapid_t>  &snap_collections, __u8 &struct_v)
+  __u8 &struct_v)
 {
   // try for v8 or later
   set<string> keys;
@@ -2950,7 +2947,6 @@ int PG::read_info(
 
     p = values[biginfo_key].begin();
     ::decode(past_intervals, p);
-    ::decode(snap_collections, p);
     ::decode(info.purged_snaps, p);
     return 0;
   }
@@ -3002,13 +2998,8 @@ int PG::read_info(
   if (struct_v < 3) {
     set<snapid_t> snap_collections_temp;
     ::decode(snap_collections_temp, p);
-    snap_collections.clear();
-    for (set<snapid_t>::iterator i = snap_collections_temp.begin();
-        i != snap_collections_temp.end();
-        ++i) {
-      snap_collections.insert(*i);
-    }
   } else {
+    interval_set<snapid_t> snap_collections;
     ::decode(snap_collections, p);
     if (struct_v >= 4 && struct_v < 6)
       ::decode(info, p);
@@ -3021,7 +3012,7 @@ int PG::read_info(
 void PG::read_state(ObjectStore *store, bufferlist &bl)
 {
   int r = read_info(store, pg_id, coll, bl, info, past_intervals,
-                   snap_collections, info_struct_v);
+                   info_struct_v);
   assert(r >= 0);
 
   ostringstream oss;

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 793277ea5a7a5d8d23907df71bdcda8dad96a42b..1670d8661e76ffe4923d24b2c5f4215384d10bbe 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -425,7 +425,6 @@ public:
     }
   } missing_loc;
   
-  interval_set<snapid_t> snap_collections; // obsolete
   map<epoch_t,pg_interval_t> past_intervals;
 
   interval_set<snapid_t> snap_trimq;
@@ -2105,7 +2104,6 @@ public:
   static int _write_info(ObjectStore::Transaction& t, epoch_t epoch,
     pg_info_t &info, coll_t coll,
     map<epoch_t,pg_interval_t> &past_intervals,
-    interval_set<snapid_t> &snap_collections,
     ghobject_t &pgmeta_oid,
     bool dirty_big_info);
   void write_if_dirty(ObjectStore::Transaction& t);
@@ -2132,7 +2130,7 @@ public:
   static int read_info(
     ObjectStore *store, spg_t pgid, const coll_t &coll,
     bufferlist &bl, pg_info_t &info, map<epoch_t,pg_interval_t> &past_intervals,
-    interval_set<snapid_t>  &snap_collections, __u8 &);
+    __u8 &);
   void read_state(ObjectStore *store, bufferlist &bl);
   static bool _has_removal_flag(ObjectStore *store, spg_t pgid);
   static epoch_t peek_map_epoch(ObjectStore *store, spg_t pgid, bufferlist *bl);

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 87f2d94e5aac9a7650a9e0af8f6ab9cbb3e18279..50a87a62a4d8767174811a35ac7e91b02e1e4ac9 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -716,10 +716,8 @@ int mark_pg_for_removal(ObjectStore *fs, spg_t pgid, ObjectStore::Transaction *t
   bufferlist bl;
   PG::peek_map_epoch(fs, pgid, &bl);
   map<epoch_t,pg_interval_t> past_intervals;
-  interval_set<snapid_t> snap_collections;
   __u8 struct_v;
-  int r = PG::read_info(fs, pgid, coll, bl, info, past_intervals,
-                       snap_collections, struct_v);
+  int r = PG::read_info(fs, pgid, coll, bl, info, past_intervals, struct_v);
   if (r < 0) {
     cerr << __func__ << " error on read_info " << cpp_strerror(-r) << std::endl;
     return r;
@@ -803,13 +801,11 @@ int write_info(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info,
     map<epoch_t,pg_interval_t> &past_intervals)
 {
   //Empty for this
-  interval_set<snapid_t> snap_collections; // obsolete
   coll_t coll(info.pgid);
   ghobject_t pgmeta_oid(info.pgid.make_pgmeta_oid());
   int ret = PG::_write_info(t, epoch,
     info, coll,
     past_intervals,
-    snap_collections,
     pgmeta_oid,
     true);
   if (ret < 0) ret = -ret;
@@ -2817,10 +2813,9 @@ int main(int argc, char **argv)
 
     pg_info_t info(pgid);
     map<epoch_t,pg_interval_t> past_intervals;
-    interval_set<snapid_t> snap_collections;
     __u8 struct_ver;
     r = PG::read_info(fs, pgid, coll, bl, info, past_intervals,
-                     snap_collections, struct_ver);
+                     struct_ver);
     if (r < 0) {
       cerr << "read_info error " << cpp_strerror(-r) << std::endl;
       ret = 1;