PG: remove direct acting and up references

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a42768cdde8f00070d079f3f39ca6ba34412f774..db3a22ccd5593a1f3ac14c0e2f4f74cbe6305343 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -188,9 +188,7 @@ PG::PG(OSDService *o, OSDMapRef curmap,
   primary(recovery_state.primary),
   pg_whoami(recovery_state.pg_whoami),
   up_primary(recovery_state.up_primary),
-  up(recovery_state.up),
   upset(recovery_state.upset),
-  acting(recovery_state.acting),
   actingset(recovery_state.actingset),
   acting_recovery_backfill(recovery_state.acting_recovery_backfill),
   dirty_info(recovery_state.dirty_info),
@@ -1640,7 +1638,8 @@ bool PG::sched_scrub()
       clear_scrub_reserved();
       scrub_unreserve_replicas();
       ret = false;
-    } else if (scrubber.reserved_peers.size() == acting.size()) {
+    } else if (scrubber.reserved_peers.size() ==
+              recovery_state.get_acting().size()) {
       dout(20) << "sched_scrub: success, reserved self and replicas" << dendl;
       if (time_for_deep) {
        dout(10) << "sched_scrub: scrub will be deep" << dendl;
@@ -3207,13 +3206,13 @@ void PG::scrub_compare_maps()
     osd->clog->warn(ss);
   }
 
-  if (acting.size() > 1) {
+  if (recovery_state.get_acting().size() > 1) {
     dout(10) << __func__ << "  comparing replica scrub maps" << dendl;
 
     // Map from object with errors to good peer
     map<hobject_t, list<pg_shard_t>> authoritative;
 
-    dout(2) << __func__ << "   osd." << acting[0] << " has "
+    dout(2) << __func__ << get_primary() << " has "
            << scrubber.primary_scrubmap.objects.size() << " items" << dendl;
 
     ss.str("");
@@ -3230,7 +3229,7 @@ void PG::scrub_compare_maps()
       scrubber.shallow_errors,
       scrubber.deep_errors,
       scrubber.store.get(),
-      info.pgid, acting,
+      info.pgid, recovery_state.get_acting(),
       ss);
     dout(2) << ss.str() << dendl;
 

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 1327358d5e91269e373a45cb356261fce50dcfe7..438beb5e47a536553273fc1e41cd6fbe05cc0ca5 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -185,9 +185,7 @@ protected:
   pg_shard_t &primary;
   pg_shard_t &pg_whoami;
   pg_shard_t &up_primary;
-  vector<int> &up;
   set<pg_shard_t> &upset;
-  vector<int> &acting;
   set<pg_shard_t> &actingset;
   set<pg_shard_t> &acting_recovery_backfill;
   bool &dirty_info;

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index e1f0b611b2dff3d44aa5db4c01970a294a09965f..742cb6a499f6c76210cfb3cfeb825f47ba84a562 100644 (file)
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -1594,7 +1594,7 @@ public:
   int get_role() const {
     return role;
   }
-  const vector<int> get_acting() const {
+  const vector<int> &get_acting() const {
     return acting;
   }
   int get_acting_primary() const {