rgw: use RGWStorageStats::dump() to format 'bucket stats'

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 979326fdd3e827caa18b9adc00911cd2b8a87c6e..39f1107d011ba24f5c92058398faf21effbb3b3b 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -976,11 +976,7 @@ static void dump_bucket_usage(map<RGWObjCategory, RGWStorageStats>& stats, Forma
     RGWStorageStats& s = iter->second;
     const char *cat_name = rgw_obj_category_name(iter->first);
     formatter->open_object_section(cat_name);
-    formatter->dump_int("size", s.size);
-    formatter->dump_int("size_actual", s.size_rounded);
-    formatter->dump_int("size_kb", rgw_rounded_kb(s.size));
-    formatter->dump_int("size_kb_actual", rgw_rounded_kb(s.size_rounded));
-    formatter->dump_int("num_objects", s.num_objects);
+    s.dump(formatter);
     formatter->close_section();
   }
   formatter->close_section();

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 62e702f02161c4b6bd3e3976c2bb7852da9664e7..034a488c744bf6c659df079fe527c4a55b1b91de 100644 (file)
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -594,9 +594,9 @@ void RGWBucketEntryPoint::decode_json(JSONObj *obj) {
 void RGWStorageStats::dump(Formatter *f) const
 {
   encode_json("size", size, f);
-  encode_json("size_rounded", size_rounded, f);
-  encode_json("num_kb", rgw_rounded_kb(size), f);
-  encode_json("num_kb_rounded", rgw_rounded_kb(size_rounded), f);
+  encode_json("size_actual", size_rounded, f);
+  encode_json("size_kb", rgw_rounded_kb(size), f);
+  encode_json("size_kb_actual", rgw_rounded_kb(size_rounded), f);
   encode_json("num_objects", num_objects, f);
 }