rados: remove {read,write}_kb fields from rados df json output

Redundant.  Do not backport.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index cf18cab11908e5fbaa48a8b2e93fe7e2b5fd2129..9e75233699d35f161d699ba1fe87a8416f1edfb0 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -23,3 +23,7 @@ v0.83
 
 * The 'rados df --format=json' output 'read_bytes' and 'write_bytes'
   fields were incorrectly reporting ops; this is now fixed.
+
+* The 'rados df --format=json' output previously included 'read_kb' and
+  'write_kb' fields; these have been removed.  Please use 'read_bytes' and
+  'write_bytes' instead (and divide by 1024 if appropriate).

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 1c2ab670b26a1f05fd00e3dfa900d06c48fd49a0..ababdcdceb0645bbef6dd84de1f37cae3cb8aa05 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1488,8 +1488,6 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
           formatter->dump_format("num_objects_degraded", "%lld", s.num_objects_degraded);
           formatter->dump_format("read_ops", "%lld", s.num_rd);
           formatter->dump_format("read_bytes", "%lld", s.num_rd_kb * 1024ull);
-          formatter->dump_format("read_kb", "%lld", s.num_rd_kb);
-          formatter->dump_format("write_kb", "%lld", s.num_wr_kb);
           formatter->dump_format("write_ops", "%lld", s.num_wr);
           formatter->dump_format("write_bytes", "%lld", s.num_wr_kb * 1024ull);
           formatter->flush(cout);