From: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
Date: Mon, 30 Mar 2015 22:13:38 +0000 (-0700)
Subject: obj_bencher: remove 'trans_size' as obsolete
X-Git-Tag: v9.0.2~233^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31d16e90108a741e92f897e550a8bf1e26392d2d;p=ceph.git

obj_bencher: remove 'trans_size' as obsolete

'trans_size' description from header: "size of the write/read to perform"
But really 'object_size' is used in write/read operations. 'trans_size' is used
only in ObjBencher::status_printer for calc current and average bandwidth.
As result - bad statistics in case 'trans_size' and and 'object_size' are different.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
---

diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index f2e4bac4fff..9d132e59c0e 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -103,7 +103,7 @@ void *ObjBencher::status_printer(void *_bencher) {
     }
     if (cycleSinceChange)
       bandwidth = (double)(data.finished - previous_writes)
-        * (data.trans_size)
+        * (data.object_size)
         / (1024*1024)
         / cycleSinceChange;
     else
@@ -133,7 +133,7 @@ void *ObjBencher::status_printer(void *_bencher) {
       data.history.iops.push_back(iops);
     }
 
-    double avg_bandwidth = (double) (data.trans_size) * (data.finished)
+    double avg_bandwidth = (double) (data.object_size) * (data.finished)
       / (double)(cur_time - data.start_time) / (1024*1024);
     if (previous_writes != data.finished) {
       previous_writes = data.finished;
@@ -199,7 +199,6 @@ int ObjBencher::aio_bench(
   lock.Lock();
   data.done = false;
   data.object_size = object_size;
-  data.trans_size = op_size;
   data.in_flight = 0;
   data.started = 0;
   data.finished = num_objects;
diff --git a/src/common/obj_bencher.h b/src/common/obj_bencher.h
index d650a05cbcb..b384dad905c 100644
--- a/src/common/obj_bencher.h
+++ b/src/common/obj_bencher.h
@@ -35,7 +35,6 @@ struct bench_history {
 struct bench_data {
   bool done; //is the benchmark is done
   int object_size; //the size of the objects
-  int trans_size; //size of the write/read to perform
   // same as object_size for write tests
   int in_flight; //number of reads/writes being waited on
   int started;