From 76fbdf1728ec176558d097cde946657de4d85c6b Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 21 Jan 2011 17:43:47 -0800 Subject: [PATCH] MDSMap: Update/fix print function. It previously didn't look at standby_for_name unless standby_for_rank was set! Also, we now let it print out standby_for_rank on any value that isn't set to the default (-1), since -2 means something. Signed-off-by: Greg Farnum --- src/mds/MDSMap.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index 9a6a6794cdb43..957d77d07b5a6 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -98,12 +98,12 @@ void MDSMap::print(ostream& out) << " seq " << info.state_seq; if (info.laggy()) out << " laggy since " << info.laggy_since; - if (info.standby_for_rank >= 0 || - info.standby_for_rank >= 0) { + if (info.standby_for_rank != -1 || + !info.standby_for_name.empty()) { out << " (standby for"; - if (info.standby_for_rank >= 0) + //if (info.standby_for_rank >= 0) out << " rank " << info.standby_for_rank; - if (info.standby_for_name.length()) + if (!info.standby_for_name.empty()) out << " '" << info.standby_for_name << "'"; out << ")"; } -- 2.39.5