]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: protect get_last_peering_reset
authorSage Weil <sage@redhat.com>
Fri, 15 Sep 2017 22:22:01 +0000 (18:22 -0400)
committerSage Weil <sage@redhat.com>
Fri, 6 Oct 2017 18:08:17 +0000 (13:08 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.h

index a541dc42c6ee0807049187ba7edfa4302f76ed89..c56e18399de6cc9e6e0f79940a8aae54903a0de6 100644 (file)
@@ -331,9 +331,6 @@ public:
   bool is_primary() const {
     return pg_whoami == primary;
   }
-  epoch_t get_last_peering_reset() const {
-    return last_peering_reset;
-  }
   bool pg_has_reset_since(epoch_t e) {
     assert(is_locked());
     return deleting || e < get_last_peering_reset();
@@ -874,6 +871,9 @@ protected:
                                        // which are unfound on the primary
   epoch_t last_peering_reset;
 
+  epoch_t get_last_peering_reset() const {
+    return last_peering_reset;
+  }
 
   /* heartbeat peers */
   void set_probe_targets(const set<pg_shard_t> &probe_set);