rados: Add units to rados bench output

Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 669b932934d60bbfa751cebd9340f11bd95e2853)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index 431c1a2d2cd3e4608cca385638ca136b1d4b9bf9..32fb9a2f19758dfea60073fa874fc01fc9ae088a 100644 (file)
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -91,14 +91,14 @@ void *ObjBencher::status_printer(void *_bencher) {
             << " avg lat: " << data.avg_latency << std::endl;
       //I'm naughty and don't reset the fill
       bencher->out(cout, cur_time) << setfill(' ')
-          << setw(5) << "sec"
-          << setw(8) << "Cur ops"
-          << setw(10) << "started"
-          << setw(10) << "finished"
-          << setw(10) << "avg MB/s"
-          << setw(10) << "cur MB/s"
-          << setw(10) << "last lat"
-          << setw(10) << "avg lat" << std::endl;
+        << setw(5) << "sec"
+        << setw(8) << "Cur ops"
+        << setw(10) << "started"
+        << setw(10) << "finished"
+        << setw(10) << "avg MB/s"
+        << setw(10) << "cur MB/s"
+        << setw(12) << "last lat(s)"
+        << setw(12) << "avg lat(s)" << std::endl;
     }
     if (cycleSinceChange)
       bandwidth = (double)(data.finished - previous_writes)
@@ -122,26 +122,28 @@ void *ObjBencher::status_printer(void *_bencher) {
     if (previous_writes != data.finished) {
       previous_writes = data.finished;
       cycleSinceChange = 0;
-      bencher->out(cout, cur_time) << setfill(' ')
-          << setw(5) << i
-          << setw(8) << data.in_flight
-          << setw(10) << data.started
-          << setw(10) << data.finished
-          << setw(10) << avg_bandwidth
-          << setw(10) << bandwidth
-          << setw(10) << (double)data.cur_latency
-          << setw(10) << data.avg_latency << std::endl;
+      bencher->out(cout, cur_time)
+        << setfill(' ')
+        << setw(5) << i
+        << ' ' << setw(7) << data.in_flight
+        << ' ' << setw(9) << data.started
+        << ' ' << setw(9) << data.finished
+        << ' ' << setw(9) << avg_bandwidth
+        << ' ' << setw(9) << bandwidth
+        << ' ' << setw(11) << (double)data.cur_latency
+        << ' ' << setw(11) << data.avg_latency << std::endl;
     }
     else {
-      bencher->out(cout, cur_time) << setfill(' ')
-          << setw(5) << i
-          << setw(8) << data.in_flight
-          << setw(10) << data.started
-          << setw(10) << data.finished
-          << setw(10) << avg_bandwidth
-          << setw(10) << '0'
-          << setw(10) << '-'
-          << setw(10) << data.avg_latency << std::endl;
+      bencher->out(cout, cur_time)
+        << setfill(' ')
+        << setw(5) << i
+        << ' ' << setw(7) << data.in_flight
+        << ' ' << setw(9) << data.started
+        << ' ' << setw(9) << data.finished
+        << ' ' << setw(9) << avg_bandwidth
+        << ' ' << setw(9) << '0'
+        << ' ' << setw(11) << '-'
+        << ' '<< setw(11) << data.avg_latency << std::endl;
     }
     ++i;
     ++cycleSinceChange;
@@ -457,16 +459,17 @@ int ObjBencher::write_bench(int secondsToRun, int maxObjectsToCreate,
   snprintf(bw, sizeof(bw), "%.3lf \n", bandwidth);
 
   out(cout) << "Total time run:         " << timePassed << std::endl
-       << "Total writes made:      " << data.finished << std::endl
-       << "Write size:             " << data.object_size << std::endl
-       << "Bandwidth (MB/sec):     " << bw << std::endl
-       << "Stddev Bandwidth:       " << vec_stddev(data.history.bandwidth) << std::endl
-       << "Max bandwidth (MB/sec): " << data.idata.max_bandwidth << std::endl
-       << "Min bandwidth (MB/sec): " << data.idata.min_bandwidth << 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;
+    << "Total writes made:      " << data.finished << std::endl
+    << "Write size:             " << data.object_size << std::endl
+    << "Bandwidth (MB/sec):     " << bw << std::endl
+    << "Stddev Bandwidth:       " << vec_stddev(data.history.bandwidth) << std::endl
+    << "Max bandwidth (MB/sec): " << data.idata.max_bandwidth << std::endl
+    << "Min bandwidth (MB/sec): " << data.idata.min_bandwidth << std::endl
+    << "Average IOPS:           " << (int)(data.finished/timePassed) << 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;
 
   //write object size/number data for read benchmarks
   ::encode(data.object_size, b_write);
@@ -675,11 +678,12 @@ int ObjBencher::seq_read_bench(int seconds_to_run, int num_objects, int concurre
 
   out(cout) << "Total time run:        " << runtime << std::endl
        << "Total reads made:     " << data.finished << std::endl
-       << "Read size:            " << data.object_size << std::endl
-       << "Bandwidth (MB/sec):    " << bw << std::endl
-       << "Average Latency:       " << data.avg_latency << std::endl
-       << "Max latency:           " << data.max_latency << std::endl
-       << "Min latency:           " << data.min_latency << std::endl;
+       << "Read size:          " << data.object_size << std::endl
+       << "Bandwidth (MB/sec):   " << setprecision(3) << bandwidth << std::endl
+       << "Average IOPS          " << (int)(data.finished/runtime) << 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;
 
   completions_done();
 
@@ -883,11 +887,12 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
 
   out(cout) << "Total time run:        " << runtime << std::endl
        << "Total reads made:     " << data.finished << std::endl
-       << "Read size:            " << data.object_size << std::endl
-       << "Bandwidth (MB/sec):    " << bw << std::endl
-       << "Average Latency:       " << data.avg_latency << std::endl
-       << "Max latency:           " << data.max_latency << std::endl
-       << "Min latency:           " << data.min_latency << std::endl;
+       << "Read size:          " << data.object_size << std::endl
+       << "Bandwidth (MB/sec):   " << setprecision(3) << bandwidth << std::endl
+       << "Average IOPS:         " << (int)(data.finished/runtime) << 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;
 
   completions_done();