From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Mon, 14 May 2012 16:53:21 +0000 (-0700)
Subject: workloadgen: Add transaction throughput infos.
X-Git-Tag: v0.47~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2b446620ce2b54a01075d811e50553f7a7a11fb7;p=ceph.git

workloadgen: Add transaction throughput infos.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/test/filestore/workload_generator.cc b/src/test/filestore/workload_generator.cc
index 99d31b95e1ae7..dab0b4513fb6e 100644
--- a/src/test/filestore/workload_generator.cc
+++ b/src/test/filestore/workload_generator.cc
@@ -50,6 +50,7 @@ WorkloadGenerator::WorkloadGenerator(vector<const char*> args)
     m_suppress_write_data(false), m_suppress_write_xattr_obj(false),
     m_suppress_write_xattr_coll(false), m_suppress_write_log(false),
     m_do_stats(false),
+    m_stats_finished_txs(0),
     m_stats_written_data(0), m_stats_duration(), m_stats_lock("WorldloadGenerator::m_stats_lock"),
     m_stats_show_secs(5)
 {
@@ -408,11 +409,14 @@ void WorkloadGenerator::run()
 
         // when cast to double, a utime_t behaves properly
         double throughput = (m_stats_written_data / ((double) m_stats_duration));
+        double tx_throughput (m_stats_finished_txs / ((double) m_stats_duration));
 
         dout(0) << __func__ << " written data: " << m_stats_written_data
             << " duration: " << m_stats_duration << dendl;
-        dout(0) << "Throughput  " << prettybyte_t(throughput) << "/s" << dendl;
+        dout(0) << "Throughput bandwidth " << prettybyte_t(throughput) << "/s"
+            << " transactions " << tx_throughput << "/s" << dendl;
 
+        m_stats_finished_txs = 0;
         m_stats_written_data = 0;
         m_stats_duration = utime_t();
 
diff --git a/src/test/filestore/workload_generator.h b/src/test/filestore/workload_generator.h
index 05141a1ec6012..35426ff81ff39 100644
--- a/src/test/filestore/workload_generator.h
+++ b/src/test/filestore/workload_generator.h
@@ -77,6 +77,7 @@ class WorkloadGenerator : public TestFileStoreState {
 
   bool m_do_stats;
 
+  int m_stats_finished_txs;
   size_t m_stats_written_data;
   utime_t m_stats_duration;
   Mutex m_stats_lock;
@@ -167,6 +168,7 @@ public:
       stat_state->wrkldgen->m_stats_lock.Lock();
       stat_state->wrkldgen->m_stats_duration += taken;
       stat_state->wrkldgen->m_stats_written_data += stat_state->written_data;
+      stat_state->wrkldgen->m_stats_finished_txs ++;
       stat_state->wrkldgen->m_stats_lock.Unlock();
     }
   };