diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-20 20:49:55 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-20 20:49:55 -0700 |
| commit | 935eb22833f1e9e659bbec2350a4fcbc88bdcc9d (patch) | |
| tree | 47f5b3b3ac41784413c526b46f4b578149e0ffa3 | |
| parent | 4d0ee0b55b02c43aa14d91c6bf279ab5efc7daaa (diff) | |
| download | ceph-935eb22833f1e9e659bbec2350a4fcbc88bdcc9d.tar.gz | |
ceph_test_rados: fix seq_num, improve error output
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/test/osd/RadosModel.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 3a73ac33faf..f8dc8b6a906 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -792,8 +792,6 @@ public: context->oid_in_use.insert(oid); context->oid_not_in_use.erase(oid); - context->seq_num++; - vector<uint64_t> snapset(context->snaps.size()); int j = 0; for (map<int,uint64_t>::reverse_iterator i = context->snaps.rbegin(); @@ -804,6 +802,7 @@ public: interval_set<uint64_t> ranges; context->cont_gen.get_ranges(cont, ranges); std::cout << num << ": seq_num " << context->seq_num << " ranges " << ranges << std::endl; + context->seq_num++; context->state_lock.Unlock(); int r = context->io_ctx.selfmanaged_snap_set_write_ctx(context->seq, snapset); @@ -1081,8 +1080,8 @@ public: context->errors++; } if (to_check != old_value.most_recent()) { - cerr << num << ": Found incorrect object contents " << to_check - << ", expected " << old_value.most_recent() << " oid " << oid << std::endl; + cerr << num << ": oid " << oid << " found incorrect object contents " << to_check + << ", expected " << old_value.most_recent() << std::endl; context->errors++; } if (!old_value.check(result)) { |