ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-02 00:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-test: implement 'speculum' checking for ttl testcase.

Browse Source 
Change-Id: Ic825711893f782a71e75447575ac76644ac3f482
This commit is contained in:
Leonid Yuriev 2020-05-18 16:39:55 +03:00
parent d1d65f8090
commit 3990f1cc07
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/nested.cc
View File

@ -178,7 +178,6 @@ bool testcase_nested::trim_tail(unsigned window_width) {
fifo.size());
db_table_clear(dbi, txn_guard.get());
fifo.clear();
speculum.clear();
}
return true;
}

12
test/test.cc
View File

@ -172,6 +172,7 @@ void testcase::txn_begin(bool readonly, unsigned flags) {
if (unlikely(rc != MDBX_SUCCESS))
failure_perror("mdbx_txn_begin()", rc);
txn_guard.reset(txn);
need_speculum_assign = config.params.speculum && !readonly;
log_trace("<< txn_begin(%s, 0x%04X)", readonly ? "read-only" : "read-write",
flags);
@ -192,9 +193,12 @@ int testcase::breakable_commit() {
if (unlikely(err != MDBX_SUCCESS && err != MDBX_THREAD_MISMATCH &&
err != MDBX_BAD_TXN))
failure_perror("mdbx_txn_abort()", err);
if (need_speculum_assign)
speculum = speculum_commited;
} else
failure_perror("mdbx_txn_commit()", err);
}
} else if (need_speculum_assign)
speculum_commited = speculum;
log_trace("<< txn_commit: %s", rc ? "failed" : "Ok");
return rc;
@ -224,11 +228,15 @@ void testcase::txn_end(bool abort) {
if (unlikely(err != MDBX_SUCCESS && err != MDBX_THREAD_MISMATCH &&
err != MDBX_BAD_TXN))
failure_perror("mdbx_txn_abort()", err);
if (need_speculum_assign)
speculum = speculum_commited;
} else {
txn_inject_writefault(txn);
int err = mdbx_txn_commit(txn);
if (unlikely(err != MDBX_SUCCESS))
failure_perror("mdbx_txn_commit()", err);
if (need_speculum_assign)
speculum_commited = speculum;
}
log_trace("<< txn_end(%s)", abort ? "abort" : "commit");
@ -491,6 +499,7 @@ void testcase::db_table_drop(MDBX_dbi handle) {
int rc = mdbx_drop(txn_guard.get(), handle, true);
if (unlikely(rc != MDBX_SUCCESS))
failure_perror("mdbx_drop(delete=true)", rc);
speculum.clear();
log_trace("<< testcase::db_table_drop");
} else {
log_trace("<< testcase::db_table_drop: not needed");
@ -502,6 +511,7 @@ void testcase::db_table_clear(MDBX_dbi handle, MDBX_txn *txn) {
int rc = mdbx_drop(txn ? txn : txn_guard.get(), handle, false);
if (unlikely(rc != MDBX_SUCCESS))
failure_perror("mdbx_drop(delete=false)", rc);
speculum.clear();
log_trace("<< testcase::db_table_clear");
}

9
test/test.h
View File

@ -133,6 +133,9 @@ protected:
return cmp < 0;
}
};
// for simplify the set<pair<key,value>>
// is used instead of multimap<key,value>
using SET = std::set<Item, ItemCompare>;
const actor_config &config;
@ -143,6 +146,7 @@ protected:
scoped_txn_guard txn_guard;
scoped_cursor_guard cursor_guard;
bool signalled{false};
bool need_speculum_assign{false};
size_t nops_completed{0};
chrono::time start_timestamp;
@ -154,7 +158,7 @@ protected:
mdbx_canary canary;
} last;
SET speculum{ItemCompare(this)};
SET speculum{ItemCompare(this)}, speculum_commited{ItemCompare(this)};
bool speculum_verify();
int insert(const keygen::buffer &akey, const keygen::buffer &adata,
unsigned flags);
@ -233,11 +237,10 @@ public:
class testcase_hill : public testcase {
using inherited = testcase;
SET speculum_commited;
public:
testcase_hill(const actor_config &config, const mdbx_pid_t pid)
: testcase(config, pid), speculum_commited(ItemCompare(this)) {}
: testcase(config, pid) {}
bool run() override;
};

14
test/ttl.cc
View File

@ -97,7 +97,7 @@ bool testcase_ttl::run() {
for (unsigned n = 0; n < tail_count; ++n) {
log_trace("ttl: remove-tail %" PRIu64, tail_serial);
generate_pair(tail_serial);
err = mdbx_del(txn_guard.get(), dbi, &key->value, &data->value);
err = remove(key, data);
if (unlikely(err != MDBX_SUCCESS)) {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("ttl: tail-bailout due '%s'", mdbx_strerror(err));
@ -120,13 +120,17 @@ bool testcase_ttl::run() {
log_notice("ttl: bailout at commit due '%s'", mdbx_strerror(err));
break;
}
if (!speculum_verify()) {
log_notice("ttl: bailout after tail-trim");
return false;
}
fifo.push_front(std::make_pair(serial, head_count));
retry:
for (unsigned n = 0; n < head_count; ++n) {
log_trace("ttl: insert-head %" PRIu64, serial);
generate_pair(serial);
err = mdbx_put(txn_guard.get(), dbi, &key->value, &data->value,
insert_flags);
err = insert(key, data, insert_flags);
if (unlikely(err != MDBX_SUCCESS)) {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("ttl: head-insert skip due '%s'", mdbx_strerror(err));
@ -149,6 +153,10 @@ bool testcase_ttl::run() {
serial = fifo.front().first;
fifo.pop_front();
}
if (!speculum_verify()) {
log_notice("ttl: bailout after head-grow");
return false;
}
report(1);
rc = true;