Merge pull request #6677 from jack-changtao/test-bench

rados: bench: fix off-by-one to avoid writing past object_size Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Dec 3, 2015 · c80945f · c80945f
2 parents eb82a85 + 574e319
commit c80945f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/test/bench/bencher.cc b/src/test/bench/bencher.cc
@@ -195,7 +195,8 @@ void Bencher::run_bench()
       default: {
 	assert(0);
       }
-    }
+    } 
+    ops++;
   }
   drain_ops();
 }
diff --git a/src/test/bench/bencher.h b/src/test/bench/bencher.h
@@ -135,7 +135,7 @@ class SequentialLoad :
     boost::tuple<string, uint64_t, uint64_t, Bencher::OpType> ret =
       boost::make_tuple(*object_pos, cur_pos, length, (*op_dist)());
     cur_pos += length;
-    if (cur_pos > size) {
+    if (cur_pos >= size) {
       cur_pos = 0;
       ++object_pos;
     }