osd/PG: remove old update_store_on_load()

This isn't needed post-luminous.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 23db5e6d428d3fd98a55a30aff37bf6439575317..a1995c58d2a1071c037f81fdd1fe427a3343f066 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6510,22 +6510,6 @@ void PG::update_store_with_options()
   }
 }
 
-void PG::update_store_on_load()
-{
-  if (osd->store->get_type() == "filestore") {
-    // legacy filestore didn't store collection bit width; fix.
-    int bits = osd->store->collection_bits(ch);
-    if (bits < 0) {
-      assert(!coll.is_meta()); // otherwise OSD::load_pgs() did a bad thing
-      bits = info.pgid.get_split_bits(pool.info.get_pg_num());
-      lderr(cct) << __func__ << " setting bit width to " << bits << dendl;
-      ObjectStore::Transaction t;
-      t.collection_set_bits(coll, bits);
-      osd->store->queue_transaction(ch, std::move(t));
-    }
-  }
-}
-
 struct C_DeleteMore : public Context {
   PGRef pg;
   epoch_t epoch;
@@ -6654,7 +6638,6 @@ boost::statechart::result PG::RecoveryState::Initial::react(const Load& l)
   pg->send_notify = (!pg->is_primary());
 
   pg->update_store_with_options();
-  pg->update_store_on_load();
 
   return transit< Reset >();
 }

diff --git a/src/osd/PG.h b/src/osd/PG.h
index a119412d7a0c24d5387ad2e20ed32ec483200d41..39e7069ac6c82fed8165151de14e99ecdc1c365b 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2874,7 +2874,6 @@ protected:
   void prepare_write_info(map<string,bufferlist> *km);
 
   void update_store_with_options();
-  void update_store_on_load();
 
 public:
   static int _prepare_write_info(