apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-01 18:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sanity check subversion for log mutations

Browse Source
This commit is contained in:
Meng Xu 2020-03-27 13:07:08 -07:00
parent 32b0ba1822
commit 97f8e46388
6 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdbserver/RestoreLoader.actor.cpp
View File

@ -723,6 +723,7 @@ void _parseSerializedMutation(std::map<LoadingParam, VersionedMutationsMap>::ite
auto it = kvOps.insert(std::make_pair(LogMessageVersion(commitVersion, sub++), MutationsVec()));
ASSERT(it.second); // inserted is true
ASSERT(sub < std::numeric_limits<int32_t>::max()); // range file mutation uses int32_max as subversion
it.first->second.push_back_deep(it.first->second.arena(), mutation);
// Sampling (FASTRESTORE_SAMPLING_PERCENT%) data

4
fdbserver/RestoreMaster.actor.cpp
View File

@ -204,9 +204,13 @@ ACTOR Future<Void> startProcessRestoreRequests(Reference<RestoreMasterData> self
} catch (Error& e) {
if (restoreIndex < restoreRequests.size()) {
TraceEvent(SevError, "FastRestoreMasterProcessRestoreRequestsFailed", self->id())
.detail("Error", e.what())
.detail("ErrorCode", e.code())
.detail("RestoreRequest", restoreRequests[restoreIndex].toString());
} else {
TraceEvent(SevError, "FastRestoreMasterProcessRestoreRequestsFailed", self->id())
.detail("Error", e.what())
.detail("ErrorCode", e.code())
.detail("RestoreRequests", restoreRequests.size())
.detail("RestoreIndex", restoreIndex);
}

1
tests/slow/ApiCorrectnessAtomicRestore.txt
View File

@ -26,4 +26,5 @@ startAfter=10.0
restoreAfter=50.0
clearAfterTest=false
simBackupAgents=BackupToFile
; This test file uses old restore, which does not work on new backup format
usePartitionedLogs=false

2
tests/slow/ParallelRestoreCorrectnessAtomicOpTinyData.txt
View File

@ -25,6 +25,8 @@ testTitle=BackupAndParallelRestoreWithAtomicOp
clearAfterTest=false
simBackupAgents=BackupToFile
backupRangesCount=-1
; use new backup
usePartitionedLogs=true
testName=RandomClogging
testDuration=90.0

1
tests/slow/ParallelRestoreCorrectnessCycle.txt
View File

@ -21,6 +21,7 @@ testTitle=BackupAndRestore
simBackupAgents=BackupToFile
; backupRangesCount<0 means backup the entire normal keyspace
backupRangesCount=-1
usePartitionedLogs=true
testName=RandomClogging
testDuration=90.0

1
tests/slow/ParallelRestoreCorrectnessMultiCycles.txt
View File

@ -44,6 +44,7 @@ testTitle=BackupAndRestore
simBackupAgents=BackupToFile
; backupRangesCount<0 means backup the entire normal keyspace
backupRangesCount=-1
usePartitionedLogs=true
testName=RandomClogging
testDuration=90.0