osd/PG: drop bufferlist passed from peek_map_epoch to read_state/read_info

This is no longer used or needed.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c38fd8009f00e79b81e93b11606d926916633231..e374bd1dcb4b014b64d3cf630865c832bd767d53 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3904,9 +3904,8 @@ void OSD::load_pgs()
     }
 
     dout(10) << "pgid " << pgid << " coll " << coll_t(pgid) << dendl;
-    bufferlist bl;
     epoch_t map_epoch = 0;
-    int r = PG::peek_map_epoch(store, pgid, &map_epoch, &bl);
+    int r = PG::peek_map_epoch(store, pgid, &map_epoch);
     if (r < 0) {
       derr << __func__ << " unable to peek at " << pgid << " metadata, skipping"
           << dendl;
@@ -3940,7 +3939,7 @@ void OSD::load_pgs()
     pg->ch = store->open_collection(pg->coll);
 
     // read pg state, log
-    pg->read_state(store, bl);
+    pg->read_state(store);
 
     if (pg->must_upgrade()) {
       if (!pg->can_upgrade()) {

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7286c0b1a88bba00bfd7c2d97c58b1849c8c5962..2cbd2379f6603bf3f2f33dc868561d69c9cad562 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2997,19 +2997,15 @@ bool PG::_has_removal_flag(ObjectStore *store,
 
 int PG::peek_map_epoch(ObjectStore *store,
                       spg_t pgid,
-                      epoch_t *pepoch,
-                      bufferlist *bl)
+                      epoch_t *pepoch)
 {
   coll_t coll(pgid);
   ghobject_t legacy_infos_oid(OSD::make_infos_oid());
   ghobject_t pgmeta_oid(pgid.make_pgmeta_oid());
   epoch_t cur_epoch = 0;
 
-  assert(bl);
-  {
-    // validate collection name
-    assert(coll.is_pg());
-  }
+  // validate collection name
+  assert(coll.is_pg());
 
   // try for v8
   set<string> keys;
@@ -3193,7 +3189,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,
+  ObjectStore *store, spg_t pgid, const coll_t &coll,
   pg_info_t &info, PastIntervals &past_intervals,
   __u8 &struct_v)
 {
@@ -3229,9 +3225,9 @@ int PG::read_info(
   return 0;
 }
 
-void PG::read_state(ObjectStore *store, bufferlist &bl)
+void PG::read_state(ObjectStore *store)
 {
-  int r = read_info(store, pg_id, coll, bl, info, past_intervals,
+  int r = read_info(store, pg_id, coll, info, past_intervals,
                    info_struct_v);
   assert(r >= 0);
 

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 0d9ce47fc79833bcf1b7dd92bc8e8c42332d3e6c..d52ebf8f3d1408a01b870a3770faae41e2f8a071 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2577,14 +2577,14 @@ protected:
 public:
   static int read_info(
     ObjectStore *store, spg_t pgid, const coll_t &coll,
-    bufferlist &bl, pg_info_t &info, PastIntervals &past_intervals,
+    pg_info_t &info, PastIntervals &past_intervals,
     __u8 &);
 protected:
-  void read_state(ObjectStore *store, bufferlist &bl);
+  void read_state(ObjectStore *store);
 public:
   static bool _has_removal_flag(ObjectStore *store, spg_t pgid);
   static int peek_map_epoch(ObjectStore *store, spg_t pgid,
-                           epoch_t *pepoch, bufferlist *bl);
+                           epoch_t *pepoch);
 protected:
   void update_snap_map(
     const vector<pg_log_entry_t> &log_entries,

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 6e87d959dacdeb8145d3dc198d04d64da73ef9e7..e9c3ca7c760c543816e39a6a5f79511b3103f3bd 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -397,14 +397,13 @@ int mark_pg_for_removal(ObjectStore *fs, spg_t pgid, ObjectStore::Transaction *t
   coll_t coll(pgid);
   ghobject_t pgmeta_oid(info.pgid.make_pgmeta_oid());
 
-  bufferlist bl;
   epoch_t map_epoch = 0;
-  int r = PG::peek_map_epoch(fs, pgid, &map_epoch, &bl);
+  int r = PG::peek_map_epoch(fs, pgid, &map_epoch);
   if (r < 0)
     cerr << __func__ << " warning: peek_map_epoch reported error" << std::endl;
   PastIntervals past_intervals;
   __u8 struct_v;
-  r = PG::read_info(fs, pgid, coll, bl, info, past_intervals, struct_v);
+  r = PG::read_info(fs, pgid, coll, info, past_intervals, struct_v);
   if (r < 0) {
     cerr << __func__ << " error on read_info " << cpp_strerror(r) << std::endl;
     return r;
@@ -3460,9 +3459,8 @@ int main(int argc, char **argv)
       goto out;
     }
 
-    bufferlist bl;
     map_epoch = 0;
-    ret = PG::peek_map_epoch(fs, pgid, &map_epoch, &bl);
+    ret = PG::peek_map_epoch(fs, pgid, &map_epoch);
     if (ret < 0)
       cerr << "peek_map_epoch reports error" << std::endl;
     if (debug)
@@ -3471,8 +3469,7 @@ int main(int argc, char **argv)
     pg_info_t info(pgid);
     PastIntervals past_intervals;
     __u8 struct_ver;
-    ret = PG::read_info(fs, pgid, coll, bl, info, past_intervals,
-                     struct_ver);
+    ret = PG::read_info(fs, pgid, coll, info, past_intervals, struct_ver);
     if (ret < 0) {
       cerr << "read_info error " << cpp_strerror(ret) << std::endl;
       goto out;

diff --git a/src/tools/rebuild_mondb.cc b/src/tools/rebuild_mondb.cc
index e38ac97cbf40f80270b850a2df2743183f55cc91..4225ad81a04e178083d4d9fda18d7047cd30e246 100644 (file)
--- a/src/tools/rebuild_mondb.cc
+++ b/src/tools/rebuild_mondb.cc
@@ -362,11 +362,10 @@ int update_pgmap_pg(ObjectStore& fs, MonitorDBStore& ms)
     spg_t pgid;
     if (!coll.is_pg(&pgid))
       continue;
-    bufferlist bl;
     pg_info_t info(pgid);
     PastIntervals past_intervals;
     __u8 struct_v;
-    r = PG::read_info(&fs, pgid, coll, bl, info, past_intervals, struct_v);
+    r = PG::read_info(&fs, pgid, coll, info, past_intervals, struct_v);
     if (r < 0) {
       cerr << "failed to read_info: " << cpp_strerror(r) << std::endl;
       return r;
@@ -376,6 +375,7 @@ int update_pgmap_pg(ObjectStore& fs, MonitorDBStore& ms)
       return -EINVAL;
     }
     version_t latest_epoch = 0;
+    bufferlist bl;
     r = ms.get(prefix, stringify(pgid.pgid), bl);
     if (r >= 0) {
       pg_stat_t pg_stat;