mon/PGMap: fix digest summary of PGs by state

This fixes the PG state summary seen in 'ceph -s' to reflect PG state bits
beyond 32 bits.

Fixes: https://tracker.ceph.com/issues/44052
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1453154c252e617efd01fce59c71a5dcc3a73c23)

Conflicts:
	src/mon/PGMap.cc
- nautilus has "multimap" where master has "std::multimap"

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 3902217a38aac087d4d429dea3acdd3d3d6b6a56..97630f7a0d3e32f331eeb7dca59c23108815fad5 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -214,7 +214,7 @@ void PGMapDigest::print_summary(ceph::Formatter *f, ostream *out) const
     f->open_array_section("pgs_by_state");
 
   // list is descending numeric order (by count)
-  std::multimap<int,int> state_by_count;  // count -> state
+  std::multimap<int,uint64_t> state_by_count;  // count -> state
   for (auto p = num_pg_by_state.begin();
        p != num_pg_by_state.end();
        ++p) {