Skip to content

Make log servers return an empty version range only when it is correct to do so #12171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Make log servers return an empty version range only when it is correct to do so #12171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a954991
- Extend the disk queue entry data structure to hold the following
sbodagala Oct 23, 2024
5e3ca8c
- On restart, make log servers read disk queue entries from known
sbodagala Nov 13, 2024
0ada5c9
If version vector is enabled then preserve all versions from "knownCo…
sbodagala Dec 5, 2024
4a348f4
- Address a review comment
sbodagala Dec 5, 2024
85c91b4
- Make log servers preserve the disk queue positions of all versions
sbodagala Dec 5, 2024
5244273
- This change is in the context of the change made in PR
sbodagala Dec 10, 2024
9a34167
In the context of version vector/unicast, make log servers return
sbodagala May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions fdbserver/LogRouter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ struct LogRouterData {
int64_t generation = -1;
Reference<Histogram> peekLatencyDist;
Optional<Version> recoverAt = Optional<Version>();
Optional<std::map<uint8_t, std::vector<uint16_t>>> knownLockedTLogIds =
Optional<std::map<uint8_t, std::vector<uint16_t>>>();

struct PeekTrackerData {
std::map<int, Promise<std::pair<Version, bool>>> sequence_version;
Expand Down Expand Up @@ -140,6 +142,7 @@ struct LogRouterData {
logSet.updateLocalitySet(req.tLogLocalities);

recoverAt = req.recoverAt;
knownLockedTLogIds = req.knownLockedTLogIds;

for (int i = 0; i < req.tLogLocalities.size(); i++) {
Tag tag(tagLocalityRemoteLog, i);
Expand Down Expand Up @@ -390,8 +393,8 @@ Future<Reference<ILogSystem::IPeekCursor>> LogRouterData::getPeekCursorData(Refe
.When(logSystemChanged,
[&](const Void&) {
if (logSystem->get()) {
result =
logSystem->get()->peekLogRouter(dbgid, beginVersion, routerTag, useSatellite, recoverAt);
result = logSystem->get()->peekLogRouter(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe LogRouter doesn't explicitly need to receive the list of participating log servers (receiving it as part of LogSystemConfig is probably good enough). I will need to look into that.

dbgid, beginVersion, routerTag, useSatellite, recoverAt, knownLockedTLogIds);
primaryPeekLocation = result->getPrimaryPeekLocation();
TraceEvent("LogRouterPeekLocation", dbgid)
.detail("LogID", result->getPrimaryPeekLocation())
Expand All @@ -407,7 +410,8 @@ Future<Reference<ILogSystem::IPeekCursor>> LogRouterData::getPeekCursorData(Refe
CODE_PROBE(true, "Detect log router slow peeks");
TraceEvent(SevWarnAlways, "LogRouterSlowPeek", dbgid).detail("NextTrySatellite", !useSatellite);
useSatellite = !useSatellite;
result = logSystem->get()->peekLogRouter(dbgid, beginVersion, routerTag, useSatellite, recoverAt);
result = logSystem->get()->peekLogRouter(
dbgid, beginVersion, routerTag, useSatellite, recoverAt, knownLockedTLogIds);
primaryPeekLocation = result->getPrimaryPeekLocation();
TraceEvent("LogRouterPeekLocation", dbgid)
.detail("LogID", result->getPrimaryPeekLocation())
Expand Down
32 changes: 23 additions & 9 deletions fdbserver/LogSystemPeekCursor.actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ ACTOR Future<Void> tryEstablishPeekStream(ILogSystem::ServerPeekCursor* self) {
self->tag,
self->returnIfBlocked,
std::numeric_limits<int>::max(),
self->end.version);
self->end.version,
self->returnEmptyIfStopped);
self->peekReplyStream = self->interf->get().interf().peekStreamMessages.getReplyStream(req);
DebugLogTraceEvent(SevDebug, "SPC_StreamCreated", self->randomID)
.detail("Tag", self->tag)
Expand All @@ -56,12 +57,13 @@ ILogSystem::ServerPeekCursor::ServerPeekCursor(Reference<AsyncVar<OptionalInterf
Version begin,
Version end,
bool returnIfBlocked,
bool parallelGetMore)
bool parallelGetMore,
bool returnEmptyIfStopped)
: interf(interf), tag(tag), rd(results.arena, results.messages, Unversioned()), messageVersion(begin), end(end),
poppedVersion(0), hasMsg(false), randomID(deterministicRandom()->randomUniqueID()),
returnIfBlocked(returnIfBlocked), onlySpilled(false), parallelGetMore(parallelGetMore),
usePeekStream(SERVER_KNOBS->PEEK_USING_STREAMING), sequence(0), lastReset(0), resetCheck(Void()), slowReplies(0),
fastReplies(0), unknownReplies(0) {
fastReplies(0), unknownReplies(0), returnEmptyIfStopped(returnEmptyIfStopped) {
this->results.maxKnownVersion = 0;
this->results.minKnownCommittedVersion = 0;
DebugLogTraceEvent(SevDebug, "SPC_Starting", randomID)
Expand All @@ -84,7 +86,7 @@ ILogSystem::ServerPeekCursor::ServerPeekCursor(TLogPeekReply const& results,
end(end), poppedVersion(poppedVersion), messageAndTags(message), hasMsg(hasMsg),
randomID(deterministicRandom()->randomUniqueID()), returnIfBlocked(false), onlySpilled(false),
parallelGetMore(false), usePeekStream(false), sequence(0), lastReset(0), resetCheck(Void()), slowReplies(0),
fastReplies(0), unknownReplies(0) {
fastReplies(0), unknownReplies(0), returnEmptyIfStopped(false) {
//TraceEvent("SPC_Clone", randomID);
this->results.maxKnownVersion = 0;
this->results.minKnownCommittedVersion = 0;
Expand Down Expand Up @@ -278,6 +280,7 @@ ACTOR Future<Void> serverPeekParallelGetMore(ILogSystem::ServerPeekCursor* self,
.detail("Seq", self->sequence)
.detail("Sizes", self->futureResults.size())
.detail("Interf", self->interf->get().present() ? self->interf->get().id() : UID());

state Version expectedBegin = self->messageVersion.version;
try {
if (self->parallelGetMore || self->onlySpilled) {
Expand All @@ -292,7 +295,8 @@ ACTOR Future<Void> serverPeekParallelGetMore(ILogSystem::ServerPeekCursor* self,
self->returnIfBlocked,
self->onlySpilled,
std::make_pair(self->randomID, self->sequence++),
self->end.version),
self->end.version,
self->returnEmptyIfStopped),
taskID)));
}
if (self->sequence == std::numeric_limits<decltype(self->sequence)>::max()) {
Expand Down Expand Up @@ -450,7 +454,8 @@ ACTOR Future<Void> serverPeekGetMore(ILogSystem::ServerPeekCursor* self, TaskPri
self->returnIfBlocked,
self->onlySpilled,
Optional<std::pair<UID, int>>(),
self->end.version),
self->end.version,
self->returnEmptyIfStopped),
taskID))
: Never())) {
updateCursorWithReply(self, res);
Expand Down Expand Up @@ -594,8 +599,12 @@ ILogSystem::MergedPeekCursor::MergedPeekCursor(
}

for (int i = 0; i < logServers.size(); i++) {
bool returnEmptyIfStopped =
((SERVER_KNOBS->ENABLE_VERSION_VECTOR_TLOG_UNICAST && end != std::numeric_limits<Version>::max())
? (bestServer < 0 || i == bestServer)
: false);
auto cursor = makeReference<ILogSystem::ServerPeekCursor>(
logServers[i], tag, begin, end, bestServer >= 0, parallelGetMore);
logServers[i], tag, begin, end, bestServer >= 0, parallelGetMore, returnEmptyIfStopped);
//TraceEvent("MPC_Starting", randomID).detail("Cursor", cursor->randomID).detail("End", end);
serverCursors.push_back(cursor);
}
Expand Down Expand Up @@ -855,13 +864,18 @@ ILogSystem::SetPeekCursor::SetPeekCursor(std::vector<Reference<LogSet>> const& l
Version end,
bool parallelGetMore)
: logSets(logSets), tag(tag), bestSet(bestSet), bestServer(bestServer), currentSet(bestSet), currentCursor(0),
messageVersion(begin), hasNextMessage(false), useBestSet(true), randomID(deterministicRandom()->randomUniqueID()) {
messageVersion(begin), hasNextMessage(false), useBestSet(true), randomID(deterministicRandom()->randomUniqueID()),
end(end) {
serverCursors.resize(logSets.size());
int maxServers = 0;
for (int i = 0; i < logSets.size(); i++) {
for (int j = 0; j < logSets[i]->logServers.size(); j++) {
bool returnEmptyIfStopped =
((SERVER_KNOBS->ENABLE_VERSION_VECTOR_TLOG_UNICAST && end != std::numeric_limits<Version>::max())
? (bestServer < 0 || (i == bestSet && j == bestServer))
: false);
auto cursor = makeReference<ILogSystem::ServerPeekCursor>(
logSets[i]->logServers[j], tag, begin, end, true, parallelGetMore);
logSets[i]->logServers[j], tag, begin, end, true, parallelGetMore, returnEmptyIfStopped);
serverCursors[i].push_back(cursor);
}
maxServers = std::max<int>(maxServers, serverCursors[i].size());
Expand Down
Loading