Revert "osd/PG: pass pool options to ObjectStore on pg create"

pg is not created by the underlying store, hence the
osd->store->set_collection_opts() call always returns -ENOENT.

This reverts commit 37d7fd3b21cab055721504e1546c6b1657a400af.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 1ac80a837651199f9cf13fc896f380cc41daf8e3..a52cb65c3d187cb6eb8c843aeb974cbc777b5cd9 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6324,13 +6324,6 @@ PG::RecoveryState::Initial::Initial(my_context ctx)
   context< RecoveryMachine >().log_enter(state_name);
 }
 
-boost::statechart::result PG::RecoveryState::Initial::react(const Initialize& l)
-{
-  PG *pg = context< RecoveryMachine >().pg;
-  pg->update_store_with_options();
-  return transit< Reset >();
-}
-
 boost::statechart::result PG::RecoveryState::Initial::react(const Load& l)
 {
   PG *pg = context< RecoveryMachine >().pg;

diff --git a/src/osd/PG.h b/src/osd/PG.h
index b20333276e1ba08068d7b5eb93c9d82049e3a3dc..fe092a4ae38ce3a3ff23df45c4b620945c92c829 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2013,14 +2013,13 @@ protected:
       void exit();
 
       typedef boost::mpl::list <
-       boost::statechart::custom_reaction< Initialize >,
+       boost::statechart::transition< Initialize, Reset >,
        boost::statechart::custom_reaction< Load >,
        boost::statechart::custom_reaction< NullEvt >,
        boost::statechart::transition< boost::statechart::event_base, Crashed >
        > reactions;
 
       boost::statechart::result react(const Load&);
-      boost::statechart::result react(const Initialize&);
       boost::statechart::result react(const MNotifyRec&);
       boost::statechart::result react(const MInfoRec&);
       boost::statechart::result react(const MLogRec&);