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

remove redundant line

This commit is contained in:
Jon Fu 2020-10-07 15:04:16 -04:00
parent 31efdf1cc2
commit e696c4a8eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdbserver/masterserver.actor.cpp
View File

@ -1579,7 +1579,6 @@ ACTOR Future<Void> masterCore( Reference<MasterData> self ) {
BinaryWriter bw(Unversioned());
tr.set(recoveryCommitRequest.arena, snapshotEndVersionKey, (bw << self->lastEpochEnd).toValue());
// Clear the key so multiple recoveries will not overwrite the first version recorded
self->txnStateStore->clear(singleKeyRange(writeRecoveryKey));
tr.clear(recoveryCommitRequest.arena, singleKeyRange(writeRecoveryKey));
}
if(self->forceRecovery) {

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

@ -118,7 +118,6 @@ struct IncrementalBackupWorkload : TestWorkload {
state Reference<IBackupContainer> backupContainer;
state UID backupUID;
state Version beginVersion = invalidVersion;
TraceEvent("IBackupRestoreAttempt");
wait(success(self->backupAgent.waitBackup(cx, self->tag.toString(), false, &backupContainer, &backupUID)));
if (self->checkBeginVersion) {
TraceEvent("IBackupReadSystemKeys");
@ -149,6 +148,8 @@ struct IncrementalBackupWorkload : TestWorkload {
}
}
}
TraceEvent("IBackupRestoreAttempt")
.detail("BeginVersion", beginVersion);
wait(
success(self->backupAgent.restore(cx, cx, Key(self->tag.toString()), Key(backupContainer->getURL()),
true, invalidVersion, true, normalKeys, Key(), Key(), true, true, beginVersion)));