From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Dec 2019 20:37:02 +0000 (-0600)
Subject: mon/PGMap: use NONE for 'pg ls[-*]' output too
X-Git-Tag: v15.1.0~621^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32048%2Fhead;p=ceph.git

mon/PGMap: use NONE for 'pg ls[-*]' output too

We already show CRUSH_ITEM_NONE as NONE in the 'pg dump' output as of
57bac8ea88e5cdcb3854852d439f7e6cbf9df900; do the same for 'pg ls' (which
is the friendlier of the two and what users should be using anyway!).

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

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index e1ce677436cf..722e61f5d74b 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2279,8 +2279,8 @@ void PGMap::dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs) const
     reported << st.reported_epoch << ":" << st.reported_seq;
 
     ostringstream upstr, actingstr;
-    upstr << st.up << 'p' << st.up_primary;
-    actingstr << st.acting << 'p' << st.acting_primary;
+    upstr << pg_vector_string(st.up) << 'p' << st.up_primary;
+    actingstr << pg_vector_string(st.acting) << 'p' << st.acting_primary;
     tab << *i
         << st.stats.sum.num_objects
         << st.stats.sum.num_objects_degraded