From: Douglas Fuller <dfuller@redhat.com>
Date: Mon, 24 Jul 2017 17:29:55 +0000 (-0500)
Subject: cephfs: Always print filesystem name
X-Git-Tag: ses5-milestone10~3^2~14^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53bf6df4c92bc587ff60d841b7fba5b04b3cf41e;p=ceph.git

cephfs: Always print filesystem name

Previously, the FSMap summary omitted the filesystem
name in clusters with only one filesystem. Print the
file system name no matter what.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index e4b7a0513961..aa351d5a56db 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -126,16 +126,10 @@ void FSMap::print_summary(Formatter *f, ostream *out) const
       f->dump_unsigned("max", fs->mds_map.max_mds);
     }
   } else {
-    if (filesystems.size() == 1) {
-      auto fs = filesystems.begin()->second;
-      *out << fs->mds_map.up.size() << "/" << fs->mds_map.in.size() << "/"
-           << fs->mds_map.max_mds << " up";
-    } else {
-      for (auto i : filesystems) {
-        auto fs = i.second;
-        *out << fs->mds_map.fs_name << "-" << fs->mds_map.up.size() << "/"
-             << fs->mds_map.in.size() << "/" << fs->mds_map.max_mds << " up ";
-      }
+    for (auto i : filesystems) {
+      auto fs = i.second;
+      *out << fs->mds_map.fs_name << "-" << fs->mds_map.up.size() << "/"
+	   << fs->mds_map.in.size() << "/" << fs->mds_map.max_mds << " up ";
     }
   }