From: John Spray <john.spray@redhat.com>
Date: Mon, 2 May 2016 21:14:07 +0000 (+0100)
Subject: mds: fix mdsmap print_summary with standby replays
X-Git-Tag: v11.0.0~499^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8908%2Fhead;p=ceph.git

mds: fix mdsmap print_summary with standby replays

Fixes: http://tracker.ceph.com/issues/15705
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index a20bb09b8ce..a53c55a2568 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -151,7 +151,8 @@ void FSMap::print_summary(Formatter *f, ostream *out)
 
     const fs_cluster_id_t fscid = mds_roles.at(info.global_id);
 
-    if (info.rank != MDS_RANK_NONE) {
+    if (info.rank != MDS_RANK_NONE &&
+        info.state != MDSMap::STATE_STANDBY_REPLAY) {
       if (f) {
         f->open_object_section("mds");
         f->dump_unsigned("filesystem_id", fscid);
diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index f66fc7a85e4..92968137b62 100644
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -267,7 +267,7 @@ void MDSMap::print_summary(Formatter *f, ostream *out) const
     if (p.second.laggy())
       s += "(laggy or crashed)";
 
-    if (p.second.rank >= 0) {
+    if (p.second.rank >= 0 && p.second.state != MDSMap::STATE_STANDBY_REPLAY) {
       if (f) {
 	f->open_object_section("mds");
 	f->dump_unsigned("rank", p.second.rank);