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

adjust test spec and backup describe

This commit is contained in:
Jon Fu 2020-10-06 17:03:09 -04:00
parent 348ea10f3c
commit 7218586f2f
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdbclient/FileBackupAgent.actor.cpp
View File

@ -4506,7 +4506,7 @@ public:
Version beginVersion, UID randomUid) { Version beginVersion, UID randomUid) {
state Reference<IBackupContainer> bc = IBackupContainer::openContainer(url.toString()); state Reference<IBackupContainer> bc = IBackupContainer::openContainer(url.toString());
state BackupDescription desc = wait(bc->describeBackup(true, beginVersion)); state BackupDescription desc = wait(bc->describeBackup(true));
if(cxOrig.present()) { if(cxOrig.present()) {
wait(desc.resolveVersionTimes(cxOrig.get())); wait(desc.resolveVersionTimes(cxOrig.get()));
} }
@ -4525,6 +4525,7 @@ public:
if(!restoreSet.present()) { if(!restoreSet.present()) {
TraceEvent(SevWarn, "FileBackupAgentRestoreNotPossible") TraceEvent(SevWarn, "FileBackupAgentRestoreNotPossible")
.detail("BackupContainer", bc->getURL()) .detail("BackupContainer", bc->getURL())
.detail("BeginVersion", beginVersion)
.detail("TargetVersion", targetVersion); .detail("TargetVersion", targetVersion);
fprintf(stderr, "ERROR: Restore version %" PRId64 " is not possible from %s\n", targetVersion, bc->getURL().c_str()); fprintf(stderr, "ERROR: Restore version %" PRId64 " is not possible from %s\n", targetVersion, bc->getURL().c_str());
throw restore_invalid_version(); throw restore_invalid_version();

11
tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
View File

@ -32,7 +32,7 @@ clearAfterTest = false
[[test]] [[test]]
testTitle = 'PostSnapWorkloads' testTitle = 'PostSnapWorkloads'
simBackupAgents = 'BackupToFile' simBackupAgents = 'BackupToFile'
clearAfterTest = false clearAfterTest = true
[[test.workload]] [[test.workload]]
testName = 'Cycle' testName = 'Cycle'
@ -45,15 +45,6 @@ clearAfterTest = false
testName = 'IncrementalBackup' testName = 'IncrementalBackup'
tag = 'default' tag = 'default'
waitForBackup = true waitForBackup = true
[[test]]
testTitle = 'StopBackupAndClear'
simBackupAgents = 'BackupToFile'
clearAfterTest = true
[[test.workload]]
testName = 'IncrementalBackup'
tag = 'default'
stopBackup = true stopBackup = true
[[test]] [[test]]