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

FastRestore:RestoreMaster:Remove the extra lockDatabase in RestoreMaster

This commit is contained in:
Meng Xu 2019-10-16 16:05:46 -07:00
parent cc85da4876
commit cc556d77b6
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdbserver/RestoreCommon.actor.h
View File

@ -219,8 +219,7 @@ struct RestoreFileFR {
}
bool operator<(const RestoreFileFR& rhs) const {
return beginVersion < rhs.beginVersion || (beginVersion == rhs.beginVersion && endVersion < rhs.endVersion) ||
(beginVersion == rhs.beginVersion && endVersion == rhs.endVersion && fileIndex < rhs.fileIndex);
return std::tie(beginVersion, endVersion, fileIndex) < std::tie(rhs.beginVersion, rhs.endVersion, rhs.fileIndex);
}
RestoreFileFR()

1
fdbserver/RestoreMaster.actor.cpp
View File

@ -163,7 +163,6 @@ ACTOR Future<Void> startProcessRestoreRequests(Reference<RestoreMasterData> self
state Standalone<VectorRef<RestoreRequest>> restoreRequests = wait(collectRestoreRequests(cx));
// lock DB for restore
wait(lockDatabase(cx, randomUID));
state int numTries = 0;
loop {
try {

4
fdbserver/RestoreMaster.actor.h
View File

@ -132,10 +132,10 @@ struct RestoreMasterData : RestoreRoleData, public ReferenceCounted<RestoreMaste
std::sort(versionBatch->second.rangeFiles.begin(), versionBatch->second.rangeFiles.end());
std::sort(versionBatch->second.logFiles.begin(), versionBatch->second.logFiles.end());
for (auto& logFile : versionBatch->second.logFiles) {
logFile.fileIndex = (++fileIndex);
logFile.fileIndex = ++fileIndex;
}
for (auto& rangeFile : versionBatch->second.rangeFiles) {
rangeFile.fileIndex = (++fileIndex);
rangeFile.fileIndex = ++fileIndex;
}
}