]> 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)
committerJosh Durgin <josh.durgin@dreamhost.com>
Tue, 17 May 2011 21:19:50 +0000 (14:19 -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 2d86cb3c4862cf8aeca5f67b1473b7efd60ff6b2..f568c8741998c8898341a7f64f1ee1b227623964 100644 (file)
@@ -4332,13 +4332,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 2dbed3a4a7c9d31a8b816f9031e7787ae18dfb3c..9455a857008247a355f966fc50a2e015ab3d74dd 100644 (file)
@@ -1179,11 +1179,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;