]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: Replicas send Notifies in response to queries
authorSamuel Just <samuel.just@dreamhost.com>
Wed, 11 May 2011 18:56:34 +0000 (11:56 -0700)
committerSamuel Just <samuel.just@dreamhost.com>
Wed, 11 May 2011 18:56:55 +0000 (11:56 -0700)
Replicas only send Infos during activate.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/PG.cc
src/osd/PG.h

index 9e0205fc50f55860be83acfe473d23e36595b2f2..3f8dd0c387e7efaf8c87fab81daa7284efcd6531 100644 (file)
@@ -4306,13 +4306,6 @@ boost::statechart::result PG::RecoveryState::GetInfo::react(const MNotifyRec& in
   return discard_event();
 }
 
-boost::statechart::result 
-PG::RecoveryState::GetInfo::react(const MInfoRec& infoevt) {
-  // notify and info are equivalent in this context.
-  post_event(MInfoRec(infoevt.from, infoevt.info));
-  return discard_event();
-}
-
 void PG::RecoveryState::GetInfo::exit() {
   context< RecoveryMachine >().log_exit(state_name, enter_time);
 }
index cad6e87c079b92aac06596e941405138446fe351..ba8f260ae0c82ab9f087e4407a876dec12269b00 100644 (file)
@@ -1173,11 +1173,9 @@ public:
 
       typedef boost::mpl::list <
        boost::statechart::transition< GotInfo, GetLog >,
-       boost::statechart::custom_reaction< MNotifyRec >,
-       boost::statechart::custom_reaction< MInfoRec >
+       boost::statechart::custom_reaction< MNotifyRec >
        > reactions;
       boost::statechart::result react(const MNotifyRec& infoevt);
-      boost::statechart::result react(const MInfoRec& infoevt);
     };
 
     struct GetMissing;