rados: fix {read,write}_bytes value

Fill this in with kb * 1024 instead of the ops count.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 49d5553b6bc3ee8ffde76c8eef96670dcb36758b..cf18cab11908e5fbaa48a8b2e93fe7e2b5fd2129 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -20,3 +20,6 @@ v0.83
   OSDs will still maintain the following osd-specific defaults:
 
     leveldb_log               = ""
+
+* The 'rados df --format=json' output 'read_bytes' and 'write_bytes'
+  fields were incorrectly reporting ops; this is now fixed.

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 0bc21d642f9ce9a3f89fb8aa93b4a0cd4df6d618..1c2ab670b26a1f05fd00e3dfa900d06c48fd49a0 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1487,11 +1487,11 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
           formatter->dump_format("num_objects_unfound", "%lld", s.num_objects_unfound);
           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);
+          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_bytes", "%lld", s.num_wr);
           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);
         }
         if (formatter) {