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

adjusted delay and timing of version gate

This commit is contained in:
Jon Fu 2020-09-23 14:28:47 -04:00
parent 7780c24cbe
commit 285e2594ef
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fdbserver/workloads/IncrementalBackup.actor.cpp
View File

@ -54,11 +54,37 @@ struct IncrementalBackupWorkload : TestWorkload {
return _start(cx, this);
}
virtual Future<bool> check(Database const& cx) { return true; }
virtual Future<bool> check(Database const& cx) {
if (clientId || !waitVersion) {
return true;
}
return _check(cx, this);
}
ACTOR static Future<bool> _check(Database cx, IncrementalBackupWorkload* self) {
state Reference<IBackupContainer> backupContainer;
state UID backupUID;
int waitResult =
wait(self->backupAgent.waitBackup(cx, self->tag.toString(), false, &backupContainer, &backupUID));
TraceEvent("IBackupCheckWaitResult").detail("Result", waitResult);
state Reference<ReadYourWritesTransaction> tr(new ReadYourWritesTransaction(cx));
state Version v = wait(tr->getReadVersion());
loop {
BackupDescription desc = wait(backupContainer->describeBackup(true));
TraceEvent("IBackupVersionGate")
.detail("MaxLogEndVersion", desc.maxLogEnd.present() ? desc.maxLogEnd.get() : invalidVersion)
.detail("ContiguousLogEndVersion",
desc.contiguousLogEnd.present() ? desc.contiguousLogEnd.get() : invalidVersion)
.detail("TargetVersion", v);
if (!desc.contiguousLogEnd.present()) continue;
if (desc.contiguousLogEnd.get() >= v) break;
// Avoid spamming requests with a delay
wait(delay(5.0));
}
return true;
}
ACTOR static Future<Void> _start(Database cx, IncrementalBackupWorkload* self) {
// Add a commit both before the submit and restore to test that incremental backup
// can be performed on non-empty database
if (self->submitOnly) {
Standalone<VectorRef<KeyRangeRef>> backupRanges;
backupRanges.push_back_deep(backupRanges.arena(), normalKeys);
@ -66,7 +92,12 @@ struct IncrementalBackupWorkload : TestWorkload {
try {
wait(self->backupAgent.submitBackup(cx, self->backupDir, 1e8, self->tag.toString(), backupRanges, false,
false, true));
// Wait for backup container to be created and avoid race condition
wait(delay(60.0));
int waitResult = wait(self->backupAgent.waitBackup(cx, self->tag.toString(), false));
TraceEvent("IBackupSubmitWaitResult").detail("Result", waitResult);
} catch (Error& e) {
TraceEvent("IBackupSubmitError").error(e);
if (e.code() != error_code_backup_duplicate) {
throw;
}
@ -78,18 +109,6 @@ struct IncrementalBackupWorkload : TestWorkload {
state UID backupUID;
TraceEvent("IBackupRestoreAttempt");
wait(success(self->backupAgent.waitBackup(cx, self->tag.toString(), false, &backupContainer, &backupUID)));
// TODO: add testing scenario for atomics and beginVersion
if (self->waitVersion) {
state Reference<ReadYourWritesTransaction> tr(new ReadYourWritesTransaction(cx));
state Version v = wait(tr->getReadVersion());
loop {
BackupDescription desc = wait(backupContainer->describeBackup());
if (desc.maxLogEnd.get() >= v) break;
// Avoid spamming requests with a delay
wait(delay(3.0));
}
}
wait(success(self->backupAgent.restore(cx, cx, Key(self->tag.toString()), Key(backupContainer->getURL()),
true, -1, true, normalKeys, Key(), Key(), true, true)));
TraceEvent("IBackupRestoreSuccess");

6
tests/fast/IncrementalBackup.toml
View File

@ -19,6 +19,11 @@ simBackupAgents = 'BackupToFile'
testDuration = 10.0
expectedRate = 0
[[test.workload]]
testName = 'IncrementalBackup'
tag = 'default'
waitVersion = true
[[test]]
testTitle = 'SubmitRestore'
clearAfterTest = false
@ -28,7 +33,6 @@ simBackupAgents = 'BackupToFile'
testName = 'IncrementalBackup'
tag = 'default'
restoreOnly = true
waitVersion = true
[[test]]