From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Thu, 19 Jun 2014 15:31:27 +0000 (+0100)
Subject: mon: dump 'epoch' as json unsigned instead of int
X-Git-Tag: v0.83~66^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=debaf615fcb362f9882757046ce19a63f9983984;p=ceph.git

mon: dump 'epoch' as json unsigned instead of int

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index cf481234befb..d511b406bc21 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -130,7 +130,7 @@ void MonMap::print(ostream& out) const
 
 void MonMap::dump(Formatter *f) const
 {
-  f->dump_int("epoch", epoch);
+  f->dump_unsigned("epoch", epoch);
   f->dump_stream("fsid") <<  fsid;
   f->dump_stream("modified") << last_changed;
   f->dump_stream("created") << created;
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index ed1d595b9272..ec1eaa298df0 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1915,7 +1915,7 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f)
 
   if (f) {
     f->open_object_section("timechecks");
-    f->dump_int("epoch", get_epoch());
+    f->dump_unsigned("epoch", get_epoch());
     f->dump_int("round", timecheck_round);
     f->dump_stream("round_status")
       << ((timecheck_round%2) ? "on-going" : "finished");
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index e20b8114dece..ef6fda7b66e7 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2254,7 +2254,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
   } else if (prefix == "osd getmaxosd") {
     if (f) {
       f->open_object_section("getmaxosd");
-      f->dump_int("epoch", osdmap.get_epoch());
+      f->dump_unsigned("epoch", osdmap.get_epoch());
       f->dump_int("max_osd", osdmap.get_max_osd());
       f->close_section();
       f->flush(rdata);
@@ -2338,7 +2338,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
       fullobjname = oid.name;
     if (f) {
       f->open_object_section("osd_map");
-      f->dump_int("epoch", osdmap.get_epoch());
+      f->dump_unsigned("epoch", osdmap.get_epoch());
       f->dump_string("pool", poolstr);
       f->dump_int("pool_id", pool);
       f->dump_stream("objname") << fullobjname;
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 23b30044d348..26770e2d9763 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1566,7 +1566,7 @@ bool PGMonitor::preprocess_command(MMonCommand *m)
     mon->osdmon()->osdmap.pg_to_up_acting_osds(pgid, up, acting);
     if (f) {
       f->open_object_section("pg_map");
-      f->dump_int("epoch", mon->osdmon()->osdmap.get_epoch());
+      f->dump_unsigned("epoch", mon->osdmon()->osdmap.get_epoch());
       f->dump_stream("raw_pgid") << pgid;
       f->dump_stream("pgid") << mpgid;