fix spacing and newlines at ends of files

This commit is contained in:
Jon Fu 2020-09-28 16:32:20 -04:00
parent 3aa4070adb
commit cfaa207f88
5 changed files with 9 additions and 2 deletions

View File

@ -3415,6 +3415,7 @@ namespace fileBackup {
state Version restoreVersion;
state Version beginVersion;
state Reference<IBackupContainer> bc;
loop {
try {
tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
@ -3438,6 +3439,7 @@ namespace fileBackup {
restore.fileCount().clear(tr);
Reference<IBackupContainer> _bc = wait(restore.sourceContainer().getOrThrow(tr));
bc = _bc;
wait(tr->commit());
break;
} catch(Error &e) {
@ -3573,6 +3575,7 @@ namespace fileBackup {
{
tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
tr->setOption(FDBTransactionOptions::LOCK_AWARE);
Key doneKey = wait(completionKey.get(tr, taskBucket));
state Reference<Task> task(new Task(StartFullRestoreTaskFunc::name, StartFullRestoreTaskFunc::version, doneKey));
@ -3983,7 +3986,9 @@ public:
}
// this also sets restore.add/removePrefix.
restore.initApplyMutations(tr, addPrefix, removePrefix);
Key taskKey = wait(fileBackup::StartFullRestoreTaskFunc::addTask(tr, backupAgent->taskBucket, uid, TaskCompletionKey::noSignal()));
if (lockDB)
wait(lockDatabase(tr, uid));
else

View File

@ -853,6 +853,7 @@ Key TaskBucket::addTask(Reference<ReadYourWritesTransaction> tr, Reference<Task>
else {
taskSpace = getAvailableSpace(task->getPriority()).get(key);
}
for (auto & param : task->params)
tr->set(taskSpace.pack(param.key), param.value);

View File

@ -57,6 +57,7 @@ T simulate( const T& in ) {
ACTOR Future<Void> runBackup( Reference<ClusterConnectionFile> connFile ) {
state std::vector<Future<Void>> agentFutures;
while (g_simulator.backupAgents == ISimulator::WaitForType) {
wait(delay(1.0));
}

View File

@ -6,4 +6,4 @@ testTitle = 'SimpleAtomicAdd'
initialize = true
initialValue = 15
iterations = 200
addValue = 10
addValue = 10

View File

@ -59,4 +59,4 @@ testTitle = 'SnapShutdown'
testName = 'SaveAndKill'
restartInfoLocation = 'simfdb/restartInfo.ini'
testDuration = 10.0
isRestoring = 1
isRestoring = 1