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

Fixing another change feed fetch and move race

Browse Source
This commit is contained in:
Josh Slocum 2022-03-21 17:06:47 -05:00
parent 58c0f3d772
commit 7b3a65676b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdbserver/storageserver.actor.cpp
View File

@ -2452,7 +2452,16 @@ ACTOR Future<Void> localChangeFeedStream(StorageServer* data,
} }
} }
} catch (Error& e) { } catch (Error& e) {
TraceEvent(SevError, "LocalChangeFeedError", data->thisServerID).error(e).detail("CFID", rangeID.printable()); if (e.code() == error_code_unknown_change_feed) {
TEST(true); // CF was moved away, no more local data to merge with
// Send endVersion so local stream is effectively done. We couldn't have send that already, because that
// would mean the stream would have finished without error
results.send(MutationsAndVersionRef(end, invalidVersion));
} else {
TraceEvent(SevError, "LocalChangeFeedError", data->thisServerID)
.error(e)
.detail("CFID", rangeID.printable());
}
throw; throw;
} }
} }
@ -4975,12 +4984,12 @@ ACTOR Future<Version> fetchChangeFeedApplier(StorageServer* data,
wait(yield()); wait(yield());
} }
} catch (Error& e) { } catch (Error& e) {
if (e.code() != error_code_end_of_stream) {
TraceEvent(SevDebug, "FetchChangeFeedError", data->thisServerID) TraceEvent(SevDebug, "FetchChangeFeedError", data->thisServerID)
.errorUnsuppressed(e) .errorUnsuppressed(e)
.detail("RangeID", rangeId.printable()) .detail("RangeID", rangeId.printable())
.detail("Range", range.toString()) .detail("Range", range.toString())
.detail("EndVersion", endVersion); .detail("EndVersion", endVersion);
if (e.code() != error_code_end_of_stream) {
throw; throw;
} }
} }