From: sjust@redhat.com <sjust@redhat.com>
Date: Thu, 4 Apr 2019 21:07:45 +0000 (-0700)
Subject: PG: remove first batch of unused references
X-Git-Tag: v15.1.0~2774^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=720cb40fd858a6669faccc02f5949ceffe75e4e5;p=ceph-ci.git

PG: remove first batch of unused references

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 768097c6028..d1256e505de 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -185,8 +185,6 @@ PG::PG(OSDService *o, OSDMapRef curmap,
     curmap,
     this,
     this),
-  role(recovery_state.role),
-  state(recovery_state.state),
   primary(recovery_state.primary),
   pg_whoami(recovery_state.pg_whoami),
   up_primary(recovery_state.up_primary),
@@ -195,11 +193,9 @@ PG::PG(OSDService *o, OSDMapRef curmap,
   acting(recovery_state.acting),
   actingset(recovery_state.actingset),
   acting_recovery_backfill(recovery_state.acting_recovery_backfill),
-  send_notify(recovery_state.send_notify),
   dirty_info(recovery_state.dirty_info),
   dirty_big_info(recovery_state.dirty_big_info),
   info(recovery_state.info),
-  last_written_info(recovery_state.last_written_info),
   past_intervals(recovery_state.past_intervals),
   pg_log(recovery_state.pg_log),
   last_peering_reset(recovery_state.last_peering_reset),
@@ -207,24 +203,13 @@ PG::PG(OSDService *o, OSDMapRef curmap,
   last_complete_ondisk(recovery_state.last_complete_ondisk),
   last_update_applied(recovery_state.last_update_applied),
   last_rollback_info_trimmed_to_applied(recovery_state.last_rollback_info_trimmed_to_applied),
-  stray_set(recovery_state.stray_set),
   peer_info(recovery_state.peer_info),
-  peer_bytes(recovery_state.peer_bytes),
-  peer_purged(recovery_state.peer_purged),
   peer_missing(recovery_state.peer_missing),
   peer_log_requested(recovery_state.peer_log_requested),
   peer_missing_requested(recovery_state.peer_missing_requested),
-  peer_features(recovery_state.peer_features),
-  acting_features(recovery_state.acting_features),
-  upacting_features(recovery_state.upacting_features),
-  last_require_osd_release(recovery_state.last_require_osd_release),
-  want_acting(recovery_state.want_acting),
   peer_last_complete_ondisk(recovery_state.peer_last_complete_ondisk),
   min_last_complete_ondisk(recovery_state.min_last_complete_ondisk),
   pg_trim_to(recovery_state.pg_trim_to),
-  blocked_by(recovery_state.blocked_by),
-  need_up_thru(recovery_state.need_up_thru),
-  peer_activated(recovery_state.peer_activated),
   backfill_targets(recovery_state.backfill_targets),
   async_recovery_targets(recovery_state.async_recovery_targets),
   might_have_unfound(recovery_state.might_have_unfound),
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 0448cf0a878..72fb190c424 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -182,8 +182,6 @@ protected:
   /**
    * Peering state information being moved to PeeringState
    */
-  int &role;
-  uint64_t &state;
   pg_shard_t &primary;
   pg_shard_t &pg_whoami;
   pg_shard_t &up_primary;
@@ -192,11 +190,9 @@ protected:
   vector<int> &acting;
   set<pg_shard_t> &actingset;
   set<pg_shard_t> &acting_recovery_backfill;
-  bool &send_notify;
   bool &dirty_info;
   bool &dirty_big_info;
   pg_info_t &info;
-  pg_info_t &last_written_info;
   PastIntervals &past_intervals;
   PGLog &pg_log;
   epoch_t &last_peering_reset;
@@ -204,24 +200,13 @@ protected:
   eversion_t &last_complete_ondisk;
   eversion_t &last_update_applied;
   eversion_t &last_rollback_info_trimmed_to_applied;
-  set<pg_shard_t> &stray_set;
   map<pg_shard_t, pg_info_t> &peer_info;
-  map<pg_shard_t, int64_t> &peer_bytes;
-  set<pg_shard_t> &peer_purged;
   map<pg_shard_t, pg_missing_t> &peer_missing;
   set<pg_shard_t> &peer_log_requested;
   set<pg_shard_t> &peer_missing_requested;
-  uint64_t &peer_features;
-  uint64_t &acting_features;
-  uint64_t &upacting_features;
-  unsigned &last_require_osd_release;
-  vector<int> &want_acting;
   map<pg_shard_t,eversion_t> &peer_last_complete_ondisk;
   eversion_t &min_last_complete_ondisk;
   eversion_t &pg_trim_to;
-  set<int> &blocked_by;
-  bool &need_up_thru;
-  set<pg_shard_t> &peer_activated;
   set<pg_shard_t> &backfill_targets;
   set<pg_shard_t> &async_recovery_targets;
   set<pg_shard_t> &might_have_unfound;