PG,PGBackend: expose acting and backfill_targets

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

diff --git a/src/osd/PG.h b/src/osd/PG.h
index c182a05fb7e4eb5f112173446a94c8869b7e7d78..6746e010fa67bd4184257cffca71fd7c215e9e00 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -336,7 +336,7 @@ public:
   pg_shard_t pg_whoami;
   pg_shard_t up_primary;
   vector<int> up, acting, want_acting;
-  set<pg_shard_t> actingbackfill;
+  set<pg_shard_t> actingbackfill, actingset;
   map<pg_shard_t,eversion_t> peer_last_complete_ondisk;
   eversion_t  min_last_complete_ondisk;  // up: min over last_complete_ondisk, peer_last_complete_ondisk
   eversion_t  pg_trim_to;

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index 0968323da79e9c3a182415616fc117af832690d7..b39a54efe23f5fbd8df8aee4db3271c30cb6e535 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -110,6 +110,8 @@
      virtual epoch_t get_epoch() const = 0;
 
      virtual const set<pg_shard_t> &get_actingbackfill_shards() const = 0;
+     virtual const set<pg_shard_t> &get_acting_shards() const = 0;
+     virtual const set<pg_shard_t> &get_backfill_shards() const = 0;
 
      virtual std::string gen_dbg_prefix() const = 0;
 

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 1acbf9ccbad296bbcdba122b33e2c438604211fa..f331ca97fccaace465b5155243c753282643d163 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -294,6 +294,13 @@ public:
   const set<pg_shard_t> &get_actingbackfill_shards() const {
     return actingbackfill;
   }
+  const set<pg_shard_t> &get_acting_shards() const {
+    return actingset;
+  }
+  const set<pg_shard_t> &get_backfill_shards() const {
+    return backfill_targets;
+  }
+
   std::string gen_dbg_prefix() const { return gen_prefix(); }
   
   const map<hobject_t, set<pg_shard_t> > &get_missing_loc_shards() const {