From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Sep 2017 03:44:53 +0000 (-0400)
Subject: osd/PG: make read_state, peek_map_epoch public
X-Git-Tag: v13.0.1~634^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=662bb8f430e7594e0729f91545727dd733842d37;p=ceph.git

osd/PG: make read_state, peek_map_epoch public

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 4c2c9365b711..1654bd1acd6b 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -352,6 +352,7 @@ public:
     return acting;
   }
 
+  /// initialize created PG
   void init(
     int role,
     const vector<int>& up,
@@ -363,6 +364,10 @@ public:
     bool backfill,
     ObjectStore::Transaction *t);
 
+  /// read existing pg state off disk
+  void read_state(ObjectStore *store);
+  static int peek_map_epoch(ObjectStore *store, spg_t pgid, epoch_t *pepoch);
+
   void rm_backoff(BackoffRef b);
 
   void scrub(epoch_t queued, ThreadPool::TPHandle &handle);
@@ -2571,12 +2576,8 @@ public:
     ObjectStore *store, spg_t pgid, const coll_t &coll,
     pg_info_t &info, PastIntervals &past_intervals,
     __u8 &);
-protected:
-  void read_state(ObjectStore *store);
-public:
   static bool _has_removal_flag(ObjectStore *store, spg_t pgid);
-  static int peek_map_epoch(ObjectStore *store, spg_t pgid,
-			    epoch_t *pepoch);
+
 protected:
   void update_snap_map(
     const vector<pg_log_entry_t> &log_entries,