osd/scrubber/scrub_machine*: s/ActiveReplica/ReplicaBuildingMap/g

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/scrubber/scrub_machine.cc b/src/osd/scrubber/scrub_machine.cc
index 93164778c7c4f569948117469f33257dd4be3ad7..51857d2f1c5533393fe5e25e6884641ec0e537fa 100644 (file)
--- a/src/osd/scrubber/scrub_machine.cc
+++ b/src/osd/scrubber/scrub_machine.cc
@@ -629,7 +629,7 @@ sc::result ReplicaWaitUpdates::react(const ReplicaPushesUpd&)
   if (scrbr->pending_active_pushes() == 0) {
 
     // done waiting
-    return transit<ActiveReplica>();
+    return transit<ReplicaBuildingMap>();
   }
 
   return discard_event();
@@ -644,23 +644,23 @@ sc::result ReplicaWaitUpdates::react(const FullReset&)
   return transit<NotActive>();
 }
 
-// ----------------------- ActiveReplica -----------------------------------
+// ----------------------- ReplicaBuildingMap -----------------------------------
 
-ActiveReplica::ActiveReplica(my_context ctx)
+ReplicaBuildingMap::ReplicaBuildingMap(my_context ctx)
     : my_base(ctx)
-    , NamedSimply(context<ScrubMachine>().m_scrbr, "ActiveReplica")
+    , NamedSimply(context<ScrubMachine>().m_scrbr, "ReplicaBuildingMap")
 {
   DECLARE_LOCALS;  // 'scrbr' & 'pg_id' aliases
-  dout(10) << "-- state -->> ActiveReplica" << dendl;
+  dout(10) << "-- state -->> ReplicaBuildingMap" << dendl;
   // and as we might have skipped ReplicaWaitUpdates:
   scrbr->on_replica_init();
   post_event(SchedReplica{});
 }
 
-sc::result ActiveReplica::react(const SchedReplica&)
+sc::result ReplicaBuildingMap::react(const SchedReplica&)
 {
   DECLARE_LOCALS;  // 'scrbr' & 'pg_id' aliases
-  dout(10) << "ActiveReplica::react(const SchedReplica&). is_preemptable? "
+  dout(10) << "ReplicaBuildingMap::react(const SchedReplica&). is_preemptable? "
           << scrbr->get_preemptor().is_preemptable() << dendl;
 
   if (scrbr->get_preemptor().was_preempted()) {
@@ -683,9 +683,9 @@ sc::result ActiveReplica::react(const SchedReplica&)
 /**
  * the event poster is handling the scrubber reset
  */
-sc::result ActiveReplica::react(const FullReset&)
+sc::result ReplicaBuildingMap::react(const FullReset&)
 {
-  dout(10) << "ActiveReplica::react(const FullReset&)" << dendl;
+  dout(10) << "ReplicaBuildingMap::react(const FullReset&)" << dendl;
   return transit<NotActive>();
 }
 

diff --git a/src/osd/scrubber/scrub_machine.h b/src/osd/scrubber/scrub_machine.h
index a346f09b0e153d36f87ac9536a97db858b08e917..45af1dc8d0f6722e9df1d7d927e3e6fa9447e4c5 100644 (file)
--- a/src/osd/scrubber/scrub_machine.h
+++ b/src/osd/scrubber/scrub_machine.h
@@ -145,7 +145,7 @@ struct ReservingReplicas;   ///< securing scrub resources from replicas' OSDs
 struct ActiveScrubbing;            ///< the active state for a Primary. A sub-machine.
 struct ReplicaWaitUpdates;  ///< an active state for a replica. Waiting for all
                            ///< active operations to finish.
-struct ActiveReplica;      ///< an active state for a replica.
+struct ReplicaBuildingMap;         ///< an active state for a replica.
 
 
 class ScrubMachine : public sc::state_machine<ScrubMachine, NotActive> {
@@ -311,7 +311,7 @@ struct NotActive : sc::state<NotActive, ScrubMachine>, NamedSimply {
              // a scrubbing that was initiated at recovery completion:
              sc::custom_reaction<AfterRepairScrub>,
              sc::transition<StartReplica, ReplicaWaitUpdates>,
-             sc::transition<StartReplicaNoWait, ActiveReplica>>;
+             sc::transition<StartReplicaNoWait, ReplicaBuildingMap>>;
   sc::result react(const StartScrub&);
   sc::result react(const AfterRepairScrub&);
 };
@@ -528,8 +528,8 @@ struct ReplicaWaitUpdates : sc::state<ReplicaWaitUpdates, ScrubMachine>,
 };
 
 
-struct ActiveReplica : sc::state<ActiveReplica, ScrubMachine>, NamedSimply {
-  explicit ActiveReplica(my_context ctx);
+struct ReplicaBuildingMap : sc::state<ReplicaBuildingMap, ScrubMachine>, NamedSimply {
+  explicit ReplicaBuildingMap(my_context ctx);
   using reactions = mpl::list<sc::custom_reaction<SchedReplica>,
                              sc::custom_reaction<FullReset>>;