From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Dec 2018 18:56:21 +0000 (-0600)
Subject: mon/Monitor: quorum_age in JSON output as int, not string
X-Git-Tag: v14.1.0~512^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25673%2Fhead;p=ceph.git

mon/Monitor: quorum_age in JSON output as int, not string

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 660052713fcf6..ac6d8d21d7214 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2342,7 +2342,10 @@ void Monitor::_quorum_status(Formatter *f, ostream& ss)
   f->dump_string("quorum_leader_name", quorum.empty() ? string() : monmap->get_name(*quorum.begin()));
 
   if (!quorum.empty()) {
-    f->dump_stream("quorum_age") << (mono_clock::now() - quorum_since);
+    f->dump_int(
+      "quorum_age",
+      std::chrono::duration_cast<std::chrono::seconds>(
+	mono_clock::now() - quorum_since).count());
   }
 
   f->open_object_section("monmap");
@@ -2378,7 +2381,10 @@ void Monitor::get_mon_status(Formatter *f, ostream& ss)
   f->close_section(); // quorum
 
   if (!quorum.empty()) {
-    f->dump_stream("quorum_age") << (mono_clock::now() - quorum_since);
+    f->dump_int(
+      "quorum_age",
+      std::chrono::duration_cast<std::chrono::seconds>(
+	mono_clock::now() - quorum_since).count());
   }
 
   f->open_object_section("features");
@@ -2766,7 +2772,10 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
       for (set<int>::iterator p = quorum.begin(); p != quorum.end(); ++p)
 	f->dump_string("id", monmap->get_name(*p));
       f->close_section();
-      f->dump_stream("quorum_age") << (now - quorum_since);
+      f->dump_int(
+	"quorum_age",
+	std::chrono::duration_cast<std::chrono::seconds>(
+	  mono_clock::now() - quorum_since).count());
     }
     f->open_object_section("monmap");
     monmap->dump(f);