osd: Fixes for 64-bit PG state

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 9967cad86234a364283e1c8c42b70b9421cc81d7..78731fd707911339e9043d95620f5bba820b03c3 100644 (file)
--- 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 38c5dab2f392607beb3f3e8bbab5c0e9abbe1561..31cba4b9388a89e36125df4f94aeb424c2ac9899 100644 (file)
--- 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); }