PG: make the reservation sets more descriptively named

These sets won't precisely be the backfill_targets or actingbackfill
shortly.

%s/sorted_backfill_set/remote_shards_to_reserve_backfill/g
%s/acting_osd_it/remote_recovery_reservation_it/g
%s/sorted_actingbackfill_set/remote_shards_to_reserve_recovery/g

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 2c86f3ba2d2511875be56256b2f2dedbe98f2da2..8a8fd4757a9cf6ceff6c7122eb143ebad5b2f206 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5704,7 +5704,7 @@ void PG::RecoveryState::Backfilling::exit()
 PG::RecoveryState::WaitRemoteBackfillReserved::WaitRemoteBackfillReserved(my_context ctx)
   : my_base(ctx),
     NamedState(context< RecoveryMachine >().pg->cct, "Started/Primary/Active/WaitRemoteBackfillReserved"),
-    backfill_osd_it(context< Active >().sorted_backfill_set.begin())
+    backfill_osd_it(context< Active >().remote_shards_to_reserve_backfill.begin())
 {
   context< RecoveryMachine >().log_enter(state_name);
   PG *pg = context< RecoveryMachine >().pg;
@@ -5717,7 +5717,7 @@ PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteBackfillReserve
 {
   PG *pg = context< RecoveryMachine >().pg;
 
-  if (backfill_osd_it != context< Active >().sorted_backfill_set.end()) {
+  if (backfill_osd_it != context< Active >().remote_shards_to_reserve_backfill.end()) {
     //The primary never backfills itself
     assert(*backfill_osd_it != pg->pg_whoami);
     ConnectionRef con = pg->osd->get_con_osd_cluster(
@@ -5759,8 +5759,8 @@ PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteReservationReje
 
   // Send REJECT to all previously acquired reservations
   set<pg_shard_t>::const_iterator it, begin, end, next;
-  begin = context< Active >().sorted_backfill_set.begin();
-  end = context< Active >().sorted_backfill_set.end();
+  begin = context< Active >().remote_shards_to_reserve_backfill.begin();
+  end = context< Active >().remote_shards_to_reserve_backfill.end();
   assert(begin != end);
   for (next = it = begin, ++next ; next != backfill_osd_it; ++it, ++next) {
     //The primary never backfills itself
@@ -6010,7 +6010,7 @@ void PG::RecoveryState::WaitLocalRecoveryReserved::exit()
 PG::RecoveryState::WaitRemoteRecoveryReserved::WaitRemoteRecoveryReserved(my_context ctx)
   : my_base(ctx),
     NamedState(context< RecoveryMachine >().pg->cct, "Started/Primary/Active/WaitRemoteRecoveryReserved"),
-    acting_osd_it(context< Active >().sorted_actingbackfill_set.begin())
+    remote_recovery_reservation_it(context< Active >().remote_shards_to_reserve_recovery.begin())
 {
   context< RecoveryMachine >().log_enter(state_name);
   post_event(RemoteRecoveryReserved());
@@ -6020,28 +6020,28 @@ boost::statechart::result
 PG::RecoveryState::WaitRemoteRecoveryReserved::react(const RemoteRecoveryReserved &evt) {
   PG *pg = context< RecoveryMachine >().pg;
 
-  if (acting_osd_it != context< Active >().sorted_actingbackfill_set.end()) {
+  if (remote_recovery_reservation_it != context< Active >().remote_shards_to_reserve_recovery.end()) {
     // skip myself
-    if (*acting_osd_it == pg->pg_whoami)
-      ++acting_osd_it;
+    if (*remote_recovery_reservation_it == pg->pg_whoami)
+      ++remote_recovery_reservation_it;
   }
 
-  if (acting_osd_it != context< Active >().sorted_actingbackfill_set.end()) {
+  if (remote_recovery_reservation_it != context< Active >().remote_shards_to_reserve_recovery.end()) {
     ConnectionRef con = pg->osd->get_con_osd_cluster(
-      acting_osd_it->osd, pg->get_osdmap()->get_epoch());
+      remote_recovery_reservation_it->osd, pg->get_osdmap()->get_epoch());
     if (con) {
       if (con->has_feature(CEPH_FEATURE_RECOVERY_RESERVATION)) {
        pg->osd->send_message_osd_cluster(
           new MRecoveryReserve(
            MRecoveryReserve::REQUEST,
-           spg_t(pg->info.pgid.pgid, acting_osd_it->shard),
+           spg_t(pg->info.pgid.pgid, remote_recovery_reservation_it->shard),
            pg->get_osdmap()->get_epoch()),
          con.get());
       } else {
        post_event(RemoteRecoveryReserved());
       }
     }
-    ++acting_osd_it;
+    ++remote_recovery_reservation_it;
   } else {
     post_event(AllRemotesReserved());
   }
@@ -6075,8 +6075,8 @@ void PG::RecoveryState::Recovering::release_reservations()
 
   // release remote reservations
   for (set<pg_shard_t>::const_iterator i =
-        context< Active >().sorted_actingbackfill_set.begin();
-        i != context< Active >().sorted_actingbackfill_set.end();
+        context< Active >().remote_shards_to_reserve_recovery.begin();
+        i != context< Active >().remote_shards_to_reserve_recovery.end();
         ++i) {
     if (*i == pg->pg_whoami) // skip myself
       continue;
@@ -6189,10 +6189,10 @@ void PG::RecoveryState::Clean::exit()
 PG::RecoveryState::Active::Active(my_context ctx)
   : my_base(ctx),
     NamedState(context< RecoveryMachine >().pg->cct, "Started/Primary/Active"),
-    sorted_actingbackfill_set(
+    remote_shards_to_reserve_recovery(
       context< RecoveryMachine >().pg->actingbackfill.begin(),
       context< RecoveryMachine >().pg->actingbackfill.end()),
-    sorted_backfill_set(
+    remote_shards_to_reserve_backfill(
       context< RecoveryMachine >().pg->backfill_targets.begin(),
       context< RecoveryMachine >().pg->backfill_targets.end()),
     all_replicas_activated(false)

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 8967a56fd2d7d9b8cea8b415700f8944c84834e4..9665f21d695b87a0942aa978d45d288f7aa8f4e0 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1555,8 +1555,8 @@ public:
       Active(my_context ctx);
       void exit();
 
-      const set<pg_shard_t> sorted_actingbackfill_set;
-      const set<pg_shard_t> sorted_backfill_set;
+      const set<pg_shard_t> remote_shards_to_reserve_recovery;
+      const set<pg_shard_t> remote_shards_to_reserve_backfill;
       bool all_replicas_activated;
 
       typedef boost::mpl::list <
@@ -1721,7 +1721,7 @@ public:
        boost::statechart::custom_reaction< RemoteRecoveryReserved >,
        boost::statechart::transition< AllRemotesReserved, Recovering >
        > reactions;
-      set<pg_shard_t>::const_iterator acting_osd_it;
+      set<pg_shard_t>::const_iterator remote_recovery_reservation_it;
       WaitRemoteRecoveryReserved(my_context ctx);
       boost::statechart::result react(const RemoteRecoveryReserved &evt);
       void exit();