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

Fail with correct error code in case of abort or discontinue of 

non-existing backups.
This commit is contained in:
Bhaskar Muppana 2017-10-18 15:49:49 -07:00
parent 2007f3799f
commit 360b777b78
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fdbclient/FileBackupAgent.actor.cpp
View File

@ -1145,6 +1145,7 @@ namespace fileBackup {
// Enable the stop key // Enable the stop key
state Version readVersion = wait(tr->getReadVersion()); state Version readVersion = wait(tr->getReadVersion());
config.stopVersion().set(tr, readVersion); config.stopVersion().set(tr, readVersion);
TraceEvent(SevInfo, "FBA_setStopVersion").detail("stopVersion", readVersion);
Void _ = wait(taskBucket->finish(tr, task)); Void _ = wait(taskBucket->finish(tr, task));
@ -1755,6 +1756,8 @@ namespace fileBackup {
Void _ = wait(mf->sync()); Void _ = wait(mf->sync());
std::string fileName = format("kvmanifest,%lld,%lld,%lld,%s", minVer, maxVer, totalBytes, g_random->randomUniqueID().toString().c_str()); std::string fileName = format("kvmanifest,%lld,%lld,%lld,%s", minVer, maxVer, totalBytes, g_random->randomUniqueID().toString().c_str());
TraceEvent(SevInfo, "FBA_KVManifest").detail("fileName", fileName.c_str());
Void _ = wait(bc->renameFile(tempFile, fileName)); Void _ = wait(bc->renameFile(tempFile, fileName));
return Void(); return Void();
@ -3429,7 +3432,7 @@ public:
tr->setOption(FDBTransactionOptions::LOCK_AWARE); tr->setOption(FDBTransactionOptions::LOCK_AWARE);
state KeyBackedTag tag = makeBackupTag(tagName.toString()); state KeyBackedTag tag = makeBackupTag(tagName.toString());
state UidAndAbortedFlagT current = wait(tag.getOrThrow(tr)); state UidAndAbortedFlagT current = wait(tag.getOrThrow(tr, false, backup_unneeded()));
state BackupConfig config(current.first); state BackupConfig config(current.first);
state EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN)); state EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN));
@ -3457,7 +3460,7 @@ public:
tr->setOption(FDBTransactionOptions::LOCK_AWARE); tr->setOption(FDBTransactionOptions::LOCK_AWARE);
state KeyBackedTag tag = makeBackupTag(tagName); state KeyBackedTag tag = makeBackupTag(tagName);
state UidAndAbortedFlagT current = wait(tag.getOrThrow(tr)); state UidAndAbortedFlagT current = wait(tag.getOrThrow(tr, false, backup_unneeded()));
state BackupConfig config(current.first); state BackupConfig config(current.first);
EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN)); EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN));

2
fdbclient/KeyBackedTypes.h
View File

@ -123,7 +123,7 @@ public:
auto backtrace = platform::get_backtrace(); auto backtrace = platform::get_backtrace();
return map(get(tr, snapshot), [=](Optional<T> val) -> T { return map(get(tr, snapshot), [=](Optional<T> val) -> T {
if (!val.present()) { if (!val.present()) {
TraceEvent(SevError, "KeyBackedProperty_keyNotFound") TraceEvent(SevInfo, "KeyBackedProperty_keyNotFound")
.detail("key", printable(keyCopy)) .detail("key", printable(keyCopy))
.detail("err", err.code()) .detail("err", err.code())
.detail("parentTrace", backtrace.c_str()); .detail("parentTrace", backtrace.c_str());

2
fdbserver/workloads/BackupCorrectness.actor.cpp
View File

@ -162,7 +162,7 @@ struct BackupAndRestoreCorrectnessWorkload : TestWorkload {
state int resultWait = wait(backupAgent->waitBackup(cx, backupTag.tagName, false)); state int resultWait = wait(backupAgent->waitBackup(cx, backupTag.tagName, false));
UidAndAbortedFlagT uidFlag = wait(backupTag.getOrThrow(cx)); UidAndAbortedFlagT uidFlag = wait(backupTag.getOrThrow(cx));
state UID logUid = uidFlag.first; state UID logUid = uidFlag.first;
state std::string lastBackupContainer = wait(BackupConfig(logUid).backupContainer().getOrThrow(cx)); state std::string lastBackupContainer = wait(BackupConfig(logUid).backupContainer().getOrThrow(cx, false, backup_unneeded()));
state std::string restorableFile = joinPath(lastBackupContainer, "restorable"); state std::string restorableFile = joinPath(lastBackupContainer, "restorable");
TraceEvent("BARW_lastBackupContainer", randomID).detail("backupTag", printable(tag)).detail("lastBackupContainer", lastBackupContainer) TraceEvent("BARW_lastBackupContainer", randomID).detail("backupTag", printable(tag)).detail("lastBackupContainer", lastBackupContainer)