From d36c46864753076b536959adf25588163515e2a6 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sun, 17 Sep 2017 21:17:36 -0500
Subject: [PATCH] osd: use accessors for pg resurrection

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/osd/OSD.cc | 28 ++++++++++++++--------------
 src/osd/PG.h   | 18 +++++++++++++++---
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4a9b053c6d1..63b2ccabf0d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4040,13 +4040,13 @@ int OSD::handle_pg_peering_evt(
     case RES_SELF: {
       old_pg_state->lock();
       OSDMapRef old_osd_map = old_pg_state->get_osdmap();
-      int old_role = old_pg_state->role;
-      vector<int> old_up = old_pg_state->up;
-      int old_up_primary = old_pg_state->up_primary.osd;
-      vector<int> old_acting = old_pg_state->acting;
-      int old_primary = old_pg_state->primary.osd;
-      pg_history_t old_history = old_pg_state->info.history;
-      PastIntervals old_past_intervals = old_pg_state->past_intervals;
+      int old_role = old_pg_state->get_role();
+      vector<int> old_up = old_pg_state->get_up();
+      int old_up_primary = old_pg_state->get_up_primary();
+      vector<int> old_acting = old_pg_state->get_acting();
+      int old_primary = old_pg_state->get_acting_primary();
+      pg_history_t old_history = old_pg_state->get_history();
+      PastIntervals old_past_intervals = old_pg_state->get_past_intervals();
       old_pg_state->unlock();
       pg = _create_lock_pg(
 	old_osd_map,
@@ -4075,13 +4075,13 @@ int OSD::handle_pg_peering_evt(
       assert(old_pg_state);
       old_pg_state->lock();
       OSDMapRef old_osd_map = old_pg_state->get_osdmap();
-      int old_role = old_pg_state->role;
-      vector<int> old_up = old_pg_state->up;
-      int old_up_primary = old_pg_state->up_primary.osd;
-      vector<int> old_acting = old_pg_state->acting;
-      int old_primary = old_pg_state->primary.osd;
-      pg_history_t old_history = old_pg_state->info.history;
-      PastIntervals old_past_intervals = old_pg_state->past_intervals;
+      int old_role = old_pg_state->get_role();
+      vector<int> old_up = old_pg_state->get_up();
+      int old_up_primary = old_pg_state->get_up_primary();
+      vector<int> old_acting = old_pg_state->get_acting();
+      int old_primary = old_pg_state->get_acting_primary();
+      pg_history_t old_history = old_pg_state->get_history();
+      PastIntervals old_past_intervals = old_pg_state->get_past_intervals();
       old_pg_state->unlock();
       PG *parent = _create_lock_pg(
 	old_osd_map,
diff --git a/src/osd/PG.h b/src/osd/PG.h
index c9c362ab45b..f8227cfd1ec 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -354,9 +354,24 @@ public:
   bool is_ec_pg() const {
     return pool.info.is_erasure();
   }
+  int get_role() const {
+    return role;
+  }
   const vector<int> get_acting() const {
     return acting;
   }
+  int get_acting_primary() const {
+    return primary.osd;
+  }
+  const vector<int> get_up() const {
+    return up;
+  }
+  int get_up_primary() const {
+    return up_primary.osd;
+  }
+  const PastIntervals& get_past_intervals() const {
+    return past_intervals;
+  }
 
   /// initialize created PG
   void init(
@@ -2510,9 +2525,6 @@ protected:
   }
   pg_shard_t get_primary() const { return primary; }
 
-  int get_role() const {
-    return role;
-  }
   void set_role(int r) {
     role = r;
   }
-- 
2.39.5