From: Vikhyat Umrao <vumrao@redhat.com>
Date: Mon, 9 May 2016 12:30:28 +0000 (+0530)
Subject: rados: Add cleanup message with time to rados bench output
X-Git-Tag: v10.2.3~107^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8e491168d4802ab071e30e4fdd654dca018bfe6;p=ceph.git

rados: Add cleanup message with time to rados bench output

Fixes: http://tracker.ceph.com/issues/16338

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit 885ebb1650bb4a355600d85ca436c1ecd4916dce)
---

diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index 9a2215e4616..267806cf4d5 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -231,6 +231,7 @@ int ObjBencher::aio_bench(
   int num_objects = 0;
   int r = 0;
   int prevPid = 0;
+  utime_t runtime;
 
   // default metadata object is used if user does not specify one
   const std::string run_name_meta = (run_name.empty() ? BENCH_LASTRUN_METADATA : run_name);
@@ -291,9 +292,15 @@ int ObjBencher::aio_bench(
       goto out;
     }
 
+    data.start_time = ceph_clock_now(cct);
+    out(cout) << "Cleaning up (deleting benchmark objects)" << std::endl;
+
     r = clean_up(num_objects, prevPid, concurrentios);
     if (r != 0) goto out;
 
+    runtime = ceph_clock_now(cct) - data.start_time;
+    out(cout) << "Clean up completed and total clean up time :" << runtime << std::endl;
+
     // lastrun file
     r = sync_remove(run_name_meta);
     if (r != 0) goto out;