osd: PgPriorSet: rename prior_set_affected -> affected_by_map

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e3976a17afcb90aa5b5bead3f5990bd2a9dde235..02c6e7a41e5bc42b7ee4ced4c3791e44591d9d4a 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4050,8 +4050,8 @@ boost::statechart::result PG::RecoveryState::Peering::react(const AdvMap& advmap
 {
   PG *pg = context< RecoveryMachine >().pg;
   dout(10) << "Peering advmap" << dendl;
-  if (prior_set.get()->prior_set_affected(advmap.osdmap, pg)) {
-    dout(1) << "Peering, priors_set_affected, going to Reset" << dendl;
+  if (prior_set.get()->affected_by_map(advmap.osdmap, pg)) {
+    dout(1) << "Peering, affected_by_map, going to Reset" << dendl;
     pg->state_clear(PG_STATE_PEERING);
     post_event(advmap);
     return transit< Reset >();
@@ -4935,17 +4935,16 @@ PG::PgPriorSet::PgPriorSet(const OSDMap &osdmap,
 }
 
 // true if the given map affects the prior set
-bool PG::PgPriorSet::prior_set_affected(const OSDMap *osdmap, PG *debug_pg) const
+bool PG::PgPriorSet::affected_by_map(const OSDMap *osdmap, PG *debug_pg) const
 {
   for (set<int>::iterator p = probe.begin();
        p != probe.end();
-       ++p)
-  {
+       ++p) {
     int o = *p;
 
     // did someone in the prior set go down?
     if (osdmap->is_down(o) && down.count(o) == 0) {
-      dout(10) << "prior_set_affected: osd." << o << " now down" << dendl;
+      dout(10) << "affected_by_map osd." << o << " now down" << dendl;
       return true;
     }
 
@@ -4953,11 +4952,11 @@ bool PG::PgPriorSet::prior_set_affected(const OSDMap *osdmap, PG *debug_pg) cons
     map<int,epoch_t>::const_iterator p = blocked_by.find(o);
     if (p != blocked_by.end()) {
       if (!osdmap->exists(o)) {
-       dout(10) << "prior_set_affected: osd." << o << " no longer exists" << dendl;
+       dout(10) << "affected_by_map osd." << o << " no longer exists" << dendl;
        return true;
       }
       if (osdmap->get_info(o).lost_at != p->second) {
-       dout(10) << "prior_set_affected: osd." << o << " (re)marked as lost" << dendl;
+       dout(10) << "affected_by_map osd." << o << " (re)marked as lost" << dendl;
        return true;
       }
     }
@@ -4966,18 +4965,17 @@ bool PG::PgPriorSet::prior_set_affected(const OSDMap *osdmap, PG *debug_pg) cons
   // did someone in the prior down set go up?
   for (set<int>::const_iterator p = down.begin();
        p != down.end();
-       ++p)
-  {
+       ++p) {
     int o = *p;
 
     if (osdmap->is_up(o)) {
-      dout(10) << "prior_set_affected: osd." << *p << " now up" << dendl;
+      dout(10) << "affected_by_map osd." << *p << " now up" << dendl;
       return true;
     }
 
     // did someone in the prior set get lost or destroyed?
     if (!osdmap->exists(o)) {
-      dout(10) << "prior_set_affected: osd." << o << " no longer exists" << dendl;
+      dout(10) << "affected_by_map osd." << o << " no longer exists" << dendl;
       return true;
     }
   }

diff --git a/src/osd/PG.h b/src/osd/PG.h
index c4da47716f4019267176815f97ff2c75514945cb..6e33371e4132d5deb42a8b2417acc0d450b0334a 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -856,7 +856,7 @@ public:
               const Info &info,
               PG *debug_pg=0);
 
-    bool prior_set_affected(const OSDMap *osdmap, PG *debug_pg=0) const;
+    bool affected_by_map(const OSDMap *osdmap, PG *debug_pg=0) const;
   };
 
   friend std::ostream& operator<<(std::ostream& oss,