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

bug fixes

This commit is contained in:
Josh Slocum 2021-12-02 12:40:37 -06:00
parent 632f701c8a
commit f43169cb7b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdbclient/NativeAPI.actor.cpp
View File

@ -6808,7 +6808,8 @@ Reference<ChangeFeedStorageData> DatabaseContext::getStorageData(StorageServerIn
}
Version ChangeFeedData::getVersion() {
if (notAtLatest.get() == 0 && mutations.isEmpty() && storageData.size() > 0) {
// TODO uncomment?
if (notAtLatest.get() == 0 && mutations.isEmpty() /*& storageData.size() > 0*/) {
Version v = storageData[0]->version.get();
for (int i = 1; i < storageData.size(); i++) {
if (storageData[i]->version.get() < v) {

6
fdbserver/BlobWorker.actor.cpp
View File

@ -1014,7 +1014,8 @@ struct InFlightFile {
static Reference<ChangeFeedData> newChangeFeedData(Version startVersion) {
// FIXME: should changeFeedStream guarantee that this is always set to begin-1 instead?
Reference<ChangeFeedData> r = makeReference<ChangeFeedData>();
r->lastReturnedVersion.set(startVersion);
// TODO uncomment?
// r->lastReturnedVersion.set(startVersion);
return r;
}
@ -1949,7 +1950,7 @@ ACTOR Future<Void> handleBlobGranuleFileRequest(Reference<BlobWorkerData> bwData
// lazily load files for old granule if not present
chunkRange = cur->range;
if (cur->files.isError() || !cur->files.isValid()) {
if (!cur->files.isValid() || cur->files.isError()) {
cur->files = loadHistoryFiles(bwData, cur->granuleID);
}
@ -2100,6 +2101,7 @@ ACTOR Future<Void> handleBlobGranuleFileRequest(Reference<BlobWorkerData> bwData
req.reply.send(rep);
--bwData->stats.activeReadRequests;
} catch (Error& e) {
printf("Error in BGFRequest %s\n", e.name());
if (e.code() == error_code_operation_cancelled) {
req.reply.sendError(wrong_shard_server());
throw;