From: David Zafman <dzafman@redhat.com>
Date: Thu, 14 Mar 2019 00:17:35 +0000 (-0700)
Subject: osd: Fixes for 64-bit PG state
X-Git-Tag: v14.2.1~93^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=546d35fa761ee182d962c185cdb374c6d8a2f60a;p=ceph.git

osd: Fixes for 64-bit PG state

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 12bff373d29f4cec8932aa1460da98dca711ec91)
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 9967cad8623..78731fd7079 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2380,7 +2380,7 @@ void PGMap::get_health_checks(
 
   // Specialized state printer that takes account of inversion of
   // ACTIVE, CLEAN checks.
-  auto state_name = [](const uint32_t &state) {
+  auto state_name = [](const uint64_t &state) {
     // Special cases for the states that are inverted checks
     if (state == PG_STATE_CLEAN) {
       return std::string("unclean");
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 52fba8b5b0b..1bf7a60a5ed 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2932,7 +2932,7 @@ protected:
   bool is_complete() const { return info.last_complete == info.last_update; }
   bool should_send_notify() const { return send_notify; }
 
-  int get_state() const { return state; }
+  uint64_t get_state() const { return state; }
   bool is_active() const { return state_test(PG_STATE_ACTIVE); }
   bool is_activating() const { return state_test(PG_STATE_ACTIVATING); }
   bool is_peering() const { return state_test(PG_STATE_PEERING); }