]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: rename recovery event NeedNewMap -> NeedActingChange
authorSage Weil <sage@newdream.net>
Tue, 31 Jan 2012 17:40:23 +0000 (09:40 -0800)
committerSage Weil <sage@newdream.net>
Tue, 31 Jan 2012 19:44:08 +0000 (11:44 -0800)
This is more precise.

Signed-off-by: Sage Weil <sage@newdream.net>
src/osd/PG.cc
src/osd/PG.h

index df11a3aa74523dcb9fe56708a70dfdbc0f93f5cb..c00068171d2a0cdb705f2f288d1aa697b513bbe4 100644 (file)
@@ -4051,7 +4051,7 @@ boost::statechart::result PG::RecoveryState::Active::react(const RecoveryComplet
   // adjust acting set?  (e.g. because backfill completed...)
   if (pg->acting != pg->up &&
       !pg->choose_acting(newest_update_osd)) {
-    post_event(NeedNewMap());
+    post_event(NeedActingChange());
     return discard_event();
   }
 
@@ -4365,7 +4365,7 @@ PG::RecoveryState::GetLog::GetLog(my_context ctx) :
 
   // adjust acting?
   if (!pg->choose_acting(newest_update_osd)) {
-    post_event(NeedNewMap());
+    post_event(NeedActingChange());
     return;
   }
 
index 4908904b7cee3487d7b45e8069caa74b5c446828..d37e67a1902b33729e0539bba4f202cf8ab1db08 100644 (file)
@@ -1182,8 +1182,8 @@ public:
 
     struct Peering;
     struct WaitActingChange;
-    struct NeedNewMap : boost::statechart::event< NeedNewMap > {
-      NeedNewMap() : boost::statechart::event< NeedNewMap >() {}
+    struct NeedActingChange : boost::statechart::event< NeedActingChange > {
+      NeedActingChange() : boost::statechart::event< NeedActingChange >() {}
     };
     struct Incomplete;
     struct IsIncomplete : boost::statechart::event< IsIncomplete > {
@@ -1198,7 +1198,7 @@ public:
        boost::statechart::custom_reaction< ActMap >,
        boost::statechart::custom_reaction< MNotifyRec >,
        boost::statechart::custom_reaction< AdvMap >,
-       boost::statechart::transition< NeedNewMap, WaitActingChange >,
+       boost::statechart::transition< NeedActingChange, WaitActingChange >,
        boost::statechart::transition< IsIncomplete, Incomplete >
        > reactions;
       boost::statechart::result react(const ActMap&);