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

Added yields to writing backup snapshot manifests to avoid slow tasks.

This commit is contained in:
Stephen Atherton 2018-01-17 13:28:56 -08:00
parent f6f0816bc1
commit cdd1e784dc
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbclient/BackupContainer.actor.cpp
View File

@ -336,18 +336,18 @@ public:
ACTOR static Future<Void> writeKeyspaceSnapshotFile_impl(Reference<BackupContainerFileSystem> bc, std::vector<std::string> fileNames, int64_t totalBytes) {
ASSERT(!fileNames.empty());
json_spirit::mValue json;
JSONDoc doc(json);
json_spirit::mArray &array = (doc.create("files") = json_spirit::mArray()).get_array();
state Version minVer = std::numeric_limits<Version>::max();
state Version maxVer = 0;
state RangeFile rf;
state json_spirit::mArray fileArray;
state int i;
Version minVer = std::numeric_limits<Version>::max();
Version maxVer = 0;
RangeFile rf;
for(auto &f : fileNames) {
// Validate each filename, update version range
for(i = 0; i < fileNames.size(); ++i) {
auto const &f = fileNames[i];
if(pathToRangeFile(rf, f, 0)) {
array.push_back(f);
fileArray.push_back(f);
if(rf.version < minVer)
minVer = rf.version;
if(rf.version > maxVer)
@ -355,12 +355,18 @@ public:
}
else
throw restore_unknown_file_type();
Void _ = wait(yield());
}
state json_spirit::mValue json;
state JSONDoc doc(json);
doc.create("files") = std::move(fileArray);
doc.create("totalBytes") = totalBytes;
doc.create("beginVersion") = minVer;
doc.create("endVersion") = maxVer;
Void _ = wait(yield());
state std::string docString = json_spirit::write_string(json);
state Reference<IBackupFile> f = wait(bc->writeFile(format("snapshots/snapshot,%lld,%lld,%lld", minVer, maxVer, totalBytes)));