diff options
Diffstat (limited to 'src/test/osd/TestRados.cc')
| -rw-r--r-- | src/test/osd/TestRados.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc index be919161579..842f9d2bca3 100644 --- a/src/test/osd/TestRados.cc +++ b/src/test/osd/TestRados.cc @@ -111,10 +111,13 @@ private: return new SnapCreateOp(m_op, &context, m_stats); case TEST_OP_SNAP_REMOVE: - if (context.snaps.empty()) { + if (context.snaps.size() <= context.snaps_in_use.size()) { return NULL; - } else { + } + while (true) { int snap = rand_choose(context.snaps)->first; + if (context.snaps_in_use.count(snap)) + continue; // in use; try again! cout << "snap_remove snap " << snap << std::endl; return new SnapRemoveOp(m_op, &context, snap, m_stats); } @@ -122,11 +125,12 @@ private: case TEST_OP_ROLLBACK: if (context.snaps.empty()) { return NULL; - } else { + } + { int snap = rand_choose(context.snaps)->first; string oid = *(rand_choose(context.oid_not_in_use)); cout << "rollback oid " << oid << " to " << snap << std::endl; - return new RollbackOp(m_op, &context, oid, snap); + return new RollbackOp(m_op, &context, oid, snap); } case TEST_OP_SETATTR: |