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

Minor (and asymptomatic) bug fixes where ints or enumerations are being passed as the bool snapshot argument instead of as the default value which was intended.

This commit is contained in:
Stephen Atherton 2018-10-12 15:03:21 -07:00
parent 356abb099b
commit 770b4b858b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbbackup/backup.actor.cpp
View File

@ -1080,8 +1080,8 @@ ACTOR Future<std::string> getLayerStatus(Reference<ReadYourWritesTransaction> tr
backupTagUids.push_back(config.getUid()); backupTagUids.push_back(config.getUid());
tagStates.push_back(config.stateEnum().getOrThrow(tr)); tagStates.push_back(config.stateEnum().getOrThrow(tr));
tagRangeBytes.push_back(config.rangeBytesWritten().getD(tr, 0)); tagRangeBytes.push_back(config.rangeBytesWritten().getD(tr, false, 0));
tagLogBytes.push_back(config.logBytesWritten().getD(tr, 0)); tagLogBytes.push_back(config.logBytesWritten().getD(tr, false, 0));
tagContainers.push_back(config.backupContainer().getOrThrow(tr)); tagContainers.push_back(config.backupContainer().getOrThrow(tr));
tagLastRestorableVersions.push_back(fba.getLastRestorable(tr, StringRef(tag->tagName))); tagLastRestorableVersions.push_back(fba.getLastRestorable(tr, StringRef(tag->tagName)));
} }

12
fdbclient/FileBackupAgent.actor.cpp
View File

@ -806,7 +806,7 @@ namespace fileBackup {
state UidAndAbortedFlagT current = wait(tag.getOrThrow(tr, false, backup_unneeded())); 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, false, EBackupState::STATE_NEVERRAN));
if (!backupAgent->isRunnable((BackupAgentBase::enumState)status)) { if (!backupAgent->isRunnable((BackupAgentBase::enumState)status)) {
throw backup_unneeded(); throw backup_unneeded();
@ -3375,7 +3375,7 @@ public:
} }
state BackupConfig config(oldUidAndAborted.get().first); state BackupConfig config(oldUidAndAborted.get().first);
state EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN)); state EBackupState status = wait(config.stateEnum().getD(tr, false, EBackupState::STATE_NEVERRAN));
// Break, if no longer runnable // Break, if no longer runnable
if (!FileBackupAgent::isRunnable(status)) { if (!FileBackupAgent::isRunnable(status)) {
@ -3410,7 +3410,7 @@ public:
Optional<UidAndAbortedFlagT> uidAndAbortedFlag = wait(tag.get(tr)); Optional<UidAndAbortedFlagT> uidAndAbortedFlag = wait(tag.get(tr));
if (uidAndAbortedFlag.present()) { if (uidAndAbortedFlag.present()) {
state BackupConfig prevConfig(uidAndAbortedFlag.get().first); state BackupConfig prevConfig(uidAndAbortedFlag.get().first);
state EBackupState prevBackupStatus = wait(prevConfig.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN)); state EBackupState prevBackupStatus = wait(prevConfig.stateEnum().getD(tr, false, EBackupState::STATE_NEVERRAN));
if (FileBackupAgent::isRunnable(prevBackupStatus)) { if (FileBackupAgent::isRunnable(prevBackupStatus)) {
throw backup_duplicate(); throw backup_duplicate();
} }
@ -3617,7 +3617,7 @@ public:
state KeyBackedTag tag = makeBackupTag(tagName.toString()); state KeyBackedTag tag = makeBackupTag(tagName.toString());
state UidAndAbortedFlagT current = wait(tag.getOrThrow(tr, false, backup_unneeded())); 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, false, EBackupState::STATE_NEVERRAN));
if (!FileBackupAgent::isRunnable(status)) { if (!FileBackupAgent::isRunnable(status)) {
throw backup_unneeded(); throw backup_unneeded();
@ -3668,7 +3668,7 @@ public:
state BackupConfig config(current.first); state BackupConfig config(current.first);
state Key destUidValue = wait(config.destUidValue().getOrThrow(tr)); state Key destUidValue = wait(config.destUidValue().getOrThrow(tr));
EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN)); EBackupState status = wait(config.stateEnum().getD(tr, false, EBackupState::STATE_NEVERRAN));
if (!backupAgent->isRunnable((BackupAgentBase::enumState)status)) { if (!backupAgent->isRunnable((BackupAgentBase::enumState)status)) {
throw backup_unneeded(); throw backup_unneeded();
@ -3707,7 +3707,7 @@ public:
state Future<Optional<Value>> fPaused = tr->get(backupAgent->taskBucket->getPauseKey()); state Future<Optional<Value>> fPaused = tr->get(backupAgent->taskBucket->getPauseKey());
if (uidAndAbortedFlag.present()) { if (uidAndAbortedFlag.present()) {
config = BackupConfig(uidAndAbortedFlag.get().first); config = BackupConfig(uidAndAbortedFlag.get().first);
EBackupState status = wait(config.stateEnum().getD(tr, EBackupState::STATE_NEVERRAN)); EBackupState status = wait(config.stateEnum().getD(tr, false, EBackupState::STATE_NEVERRAN));
backupState = status; backupState = status;
} }