From: Gu Zhongyan <guzhongyan@360.cn>
Date: Wed, 30 Dec 2015 08:42:07 +0000 (+0800)
Subject: rados: Add units to rados bench output
X-Git-Tag: v10.0.4~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=669b932934d60bbfa751cebd9340f11bd95e2853;p=ceph.git

rados: Add units to rados bench output

Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index ec8a7f676f22..a6dc3e8ae9d3 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -102,8 +102,8 @@ void *ObjBencher::status_printer(void *_bencher) {
           << setw(10) << "finished"
           << setw(10) << "avg MB/s"
           << setw(10) << "cur MB/s"
-          << setw(10) << "last lat"
-          << setw(10) << "avg lat" << std::endl;
+          << setw(12) << "last lat(s)"
+          << setw(12) << "avg lat(s)" << std::endl;
     }
     if (cycleSinceChange)
       bandwidth = (double)(data.finished - previous_writes)
@@ -154,8 +154,8 @@ void *ObjBencher::status_printer(void *_bencher) {
           << ' ' << setw(9) << data.finished
           << ' ' << setw(9) << avg_bandwidth
           << ' ' << setw(9) << bandwidth
-          << ' ' << setw(9) << (double)data.cur_latency
-          << ' ' << setw(9) << data.avg_latency << std::endl;
+          << ' ' << setw(11) << (double)data.cur_latency
+          << ' ' << setw(11) << data.avg_latency << std::endl;
       } else {
         formatter->dump_format("sec", "%d", i);
         formatter->dump_format("cur_ops", "%d", data.in_flight);
@@ -177,8 +177,8 @@ void *ObjBencher::status_printer(void *_bencher) {
           << ' ' << setw(9) << data.finished
           << ' ' << setw(9) << avg_bandwidth
 	  << ' ' << setw(9) << '0'
-          << ' ' << setw(9) << '-'
-          << ' '<< setw(9) << data.avg_latency << std::endl;
+          << ' ' << setw(11) << '-'
+          << ' '<< setw(11) << data.avg_latency << std::endl;
       } else {
         formatter->dump_format("sec", "%d", i);
         formatter->dump_format("cur_ops", "%d", data.in_flight);
@@ -561,10 +561,10 @@ int ObjBencher::write_bench(int secondsToRun,
        << "Stddev IOPS:            " << vec_stddev(data.history.iops) << std::endl
        << "Max IOPS:               " << data.idata.max_iops << std::endl
        << "Min IOPS:               " << data.idata.min_iops << std::endl
-       << "Average Latency:        " << data.avg_latency << std::endl
-       << "Stddev Latency:         " << vec_stddev(data.history.latency) << std::endl
-       << "Max latency:            " << data.max_latency << std::endl
-       << "Min latency:            " << data.min_latency << std::endl;
+       << "Average Latency(s):     " << data.avg_latency << std::endl
+       << "Stddev Latency(s):      " << vec_stddev(data.history.latency) << std::endl
+       << "Max latency(s):         " << data.max_latency << std::endl
+       << "Min latency(s):         " << data.min_latency << std::endl;
   } else {
     formatter->dump_format("total_time_run", "%f", (double)timePassed);
     formatter->dump_format("total_writes_made", "%d", data.finished);
@@ -807,9 +807,9 @@ int ObjBencher::seq_read_bench(int seconds_to_run, int num_objects, int concurre
        << "Stddev IOPS:          " << vec_stddev(data.history.iops) << std::endl
        << "Max IOPS:             " << data.idata.max_iops << std::endl
        << "Min IOPS:             " << data.idata.min_iops << std::endl
-       << "Average Latency:      " << data.avg_latency << std::endl
-       << "Max latency:          " << data.max_latency << std::endl
-       << "Min latency:          " << data.min_latency << std::endl;
+       << "Average Latency(s):   " << data.avg_latency << std::endl
+       << "Max latency(s):       " << data.max_latency << std::endl
+       << "Min latency(s):       " << data.min_latency << std::endl;
   } else {
     formatter->dump_format("total_time_run", "%f", (double)runtime);
     formatter->dump_format("total_reads_made", "%d", data.finished);
@@ -1040,9 +1040,9 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
        << "Stddev IOPS:          " << vec_stddev(data.history.iops) << std::endl
        << "Max IOPS:             " << data.idata.max_iops << std::endl
        << "Min IOPS:             " << data.idata.min_iops << std::endl
-       << "Average Latency:      " << data.avg_latency << std::endl
-       << "Max latency:          " << data.max_latency << std::endl
-       << "Min latency:          " << data.min_latency << std::endl;
+       << "Average Latency(s):   " << data.avg_latency << std::endl
+       << "Max latency(s):       " << data.max_latency << std::endl
+       << "Min latency(s):       " << data.min_latency << std::endl;
   } else {
     formatter->dump_format("total_time_run", "%f", (double)runtime);
     formatter->dump_format("total_reads_made", "%d", data.finished);