From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Fri, 3 Jun 2011 18:53:10 +0000 (-0700)
Subject: rados_bencher: re-add written objects constraint to read benchmark.
X-Git-Tag: v0.29~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bd016f97691919689a84b4bd27efc081826db5c;p=ceph.git

rados_bencher: re-add written objects constraint to read benchmark.

Somehow, in the last major change, the constraints that kept the
bencher from trying to read non-existent objects got removed. Put
a check back in the main bench loop to fix that.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/osdc/rados_bencher.h b/src/osdc/rados_bencher.h
index 1faa0121f707..84635e402959 100644
--- a/src/osdc/rados_bencher.h
+++ b/src/osdc/rados_bencher.h
@@ -376,7 +376,8 @@ int seq_read_bench(librados::Rados& rados, librados::IoCtx& io_ctx, int seconds_
   char* newName;
   bufferlist *cur_contents;
 
-  while (seconds_to_run && (g_clock.now() < finish_time)) {
+  while (seconds_to_run && (g_clock.now() < finish_time) &&
+      write_data->finished > data->started) {
     dataLock.Lock();
     while (1) {
       for (slot = 0; slot < concurrentios; ++slot) {