From: John Spray <john.spray@redhat.com>
Date: Wed, 30 Mar 2016 11:05:43 +0000 (+0100)
Subject: mds: omit fscid in single-filesystem status output
X-Git-Tag: v11.0.0~711^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec8f3db3e5c26b60b9333e86453e1b17324a8cfa;p=ceph.git

mds: omit fscid in single-filesystem status output

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index c704c20e6871..531519626d83 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -182,7 +182,12 @@ void FSMap::print_summary(Formatter *f, ostream *out)
         }
         *out << " " << pretty;
       } else {
-        *out << " " << by_rank;
+        // Omit FSCID in output when only one filesystem exists
+        std::map<mds_rank_t, std::string> shortened;
+        for (auto i : by_rank) {
+          shortened[i.first.rank] = i.second;
+        }
+        *out << " " << shortened;
       }
     }
   }