Skip to content

Skip empty old log router ranges #13163

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

Merged
tclinkenbeard-oai merged 5 commits into from
May 9, 2026
+13 −8
Merged

Skip empty old log router ranges #13163

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4fcecc
Skip empty old log router ranges
tclinkenbeard-oai May 6, 2026
a7e2888
Add trace event
tclinkenbeard-oai May 7, 2026
04f688a
Merge remote-tracking branch 'origin/main' into dev/tclinkenbeard/log…
tclinkenbeard-oai May 7, 2026
5a63d11
Preserve empty log router handoff at epoch boundary
tclinkenbeard-oai May 7, 2026
b5dc6d4
Merge remote-tracking branch 'origin/main' into dev/tclinkenbeard/log…
tclinkenbeard-oai May 9, 2026
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
16 changes: 8 additions & 8 deletions fdbserver/logsystem/LogSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1593,6 +1593,12 @@ Reference<IPeekCursor> LogSystem::peekLogRouter(
}
}
if (found) {
Version oldEnd = firstOld && recoveredAt.present() ? recoveredAt.get() + 1 : old.epochEnd;
if (begin >= oldEnd) {
firstOld = false;
continue;
Copy link
Copy Markdown
Collaborator

@spraza spraza May 7, 2026

Choose a reason for hiding this comment

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

Can you add a trace event here? Something like:

  TraceEvent("TLogPeekLogRouterSkipEmptyOldRange", dbgid)
      .detail("Tag", tag.toString())
      .detail("Begin", begin)
      .detail("OldEnd", oldEnd)
      .detail("FirstOld", firstOld);

}

int bestPrimarySet = 0;
int bestSatelliteSet = -1;
std::vector<Reference<LogSet>> localSets;
Expand Down Expand Up @@ -1623,14 +1629,8 @@ Reference<IPeekCursor> LogSystem::peekLogRouter(
.detail("FirstOld", firstOld);
// FIXME: do this merge on one of the logs in the other data center to avoid sending multiple copies
// across the WAN
return makeReference<SetPeekCursor>(localSets,
bestSet,
localSets[bestSet]->bestLocationFor(tag),
tag,
begin,
firstOld && recoveredAt.present() ? recoveredAt.get() + 1
: old.epochEnd,
true);
return makeReference<SetPeekCursor>(
localSets, bestSet, localSets[bestSet]->bestLocationFor(tag), tag, begin, oldEnd, true);
}
firstOld = false;
}
Expand Down