From: Sage Weil <sage@newdream.net>
Date: Tue, 31 Jan 2012 17:40:23 +0000 (-0800)
Subject: osd: rename recovery event NeedNewMap -> NeedActingChange
X-Git-Tag: v0.44~106^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9dfa46ffc11975ed07d31cbf375ee3e3349aa2d9;p=ceph.git

osd: rename recovery event NeedNewMap -> NeedActingChange

This is more precise.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index df11a3aa7452..c00068171d2a 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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;
   }
 
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 4908904b7cee..d37e67a1902b 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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&);