wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3701 from satherton/fix-redwood-correctness-timeout 

Prevent Redwood unit test timeout from trying to do too much work
This commit is contained in:
Evan Tschannen 2020-08-31 10:38:20 -07:00 committed by GitHub
parent 94dcedf22c 89ae0aaf39
commit bbb178c430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fdbserver/VersionedBTree.actor.cpp
View File

@ -6360,11 +6360,15 @@ ACTOR Future<Void> verify(VersionedBTree* btree, FutureStream<Version> vStream,
committedVersions.pop_front();
}
// Choose a random committed version, or sometimes the latest (which could be ahead of the latest version
// from vStream)
v = (committedVersions.empty() || deterministicRandom()->random01() < 0.25)
? btree->getLastCommittedVersion()
: committedVersions[deterministicRandom()->randomInt(0, committedVersions.size())];
// Continue if the versions list is empty, which won't wait until it reaches the oldest readable
// btree version which will already be in vStream.
if(committedVersions.empty()) {
continue;
}
// Choose a random committed version.
v = committedVersions[deterministicRandom()->randomInt(0, committedVersions.size())];
debug_printf("Using committed version %" PRId64 "\n", v);
// Get a cursor at v so that v doesn't get expired between the possibly serial steps below.
state Reference<IStoreCursor> cur = btree->readAtVersion(v);
@ -7242,6 +7246,7 @@ TEST_CASE("!/redwood/correctness/btree") {
pagerMemoryOnly ? 2e9 : (BUGGIFY ? deterministicRandom()->randomInt(1, 10 * pageSize) : 0);
state Version versionIncrement = deterministicRandom()->randomInt64(1, 1e8);
state Version remapCleanupWindow = deterministicRandom()->randomInt64(0, versionIncrement * 50);
state int maxVerificationMapEntries = 300e3;
printf("\n");
printf("targetPageOps: %" PRId64 "\n", targetPageOps);
@ -7260,6 +7265,7 @@ TEST_CASE("!/redwood/correctness/btree") {
printf("cacheSizeBytes: %s\n", cacheSizeBytes == 0 ? "default" : format("%" PRId64, cacheSizeBytes).c_str());
printf("versionIncrement: %" PRId64 "\n", versionIncrement);
printf("remapCleanupWindow: %" PRId64 "\n", remapCleanupWindow);
printf("maxVerificationMapEntries: %d\n", maxVerificationMapEntries);
printf("\n");
printf("Deleting existing test data...\n");
@ -7297,7 +7303,7 @@ TEST_CASE("!/redwood/correctness/btree") {
state Future<Void> commit = Void();
state int64_t totalPageOps = 0;
while (totalPageOps < targetPageOps) {
while (totalPageOps < targetPageOps && written.size() < maxVerificationMapEntries) {
// Sometimes increment the version
if (deterministicRandom()->random01() < 0.10) {
++version;
@ -7392,8 +7398,8 @@ TEST_CASE("!/redwood/correctness/btree") {
keys.insert(kv.key);
}
// Commit at end or after this commit's mutation bytes are reached
if (totalPageOps >= targetPageOps || mutationBytesThisCommit >= mutationBytesTargetThisCommit) {
// Commit after any limits for this commit or the total test are reached
if (totalPageOps >= targetPageOps || written.size() >= maxVerificationMapEntries || mutationBytesThisCommit >= mutationBytesTargetThisCommit) {
// Wait for previous commit to finish
wait(commit);
printf("Committed. Next commit %d bytes, %" PRId64 " bytes.", mutationBytesThisCommit, mutationBytes.get());
@ -7414,7 +7420,9 @@ TEST_CASE("!/redwood/correctness/btree") {
commit = map(btree->commit(), [=,&ops=totalPageOps](Void) {
// Update pager ops before clearing metrics
ops += g_redwoodMetrics.pageOps();
printf("PageOps %" PRId64 "/%" PRId64 " (%.2f%%)\n", ops, targetPageOps, ops * 100.0 / targetPageOps);
printf("PageOps %" PRId64 "/%" PRId64 " (%.2f%%) VerificationMapEntries %d/%d (%.2f%%)\n",
ops, targetPageOps, ops * 100.0 / targetPageOps,
written.size(), maxVerificationMapEntries, written.size() * 100.0 / maxVerificationMapEntries);
printf("Committed:\n%s\n", g_redwoodMetrics.toString(true).c_str());
// Notify the background verifier that version is committed and therefore readable