Skip to content

MINOR: Share common implementation for downstream offset translation boundary in MirrorMaker offset syncs #22543

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

Open
Russole wants to merge 1 commit into
base: trunk
Choose a base branch
from
+13 −6
Open

MINOR: Share common implementation for downstream offset translation boundary in MirrorMaker offset syncs #22543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions connect/mirror/src/main/java/org/apache/kafka/connect/mirror/OffsetSync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ public String toString() {
topicPartition, upstreamOffset, downstreamOffset);
}

static long downstreamOffsetAfterSync(long downstreamOffset) {
return downstreamOffset + 1;
}

long translateDownstream(long upstreamOffset) {
return upstreamOffset == this.upstreamOffset ? downstreamOffset : downstreamOffsetAfterSync(downstreamOffset);
}

ByteBuffer serializeValue() {
Struct struct = valueStruct();
ByteBuffer buffer = ByteBuffer.allocate(VALUE_SCHEMA.sizeOf(struct));
Expand Down
6 changes: 3 additions & 3 deletions connect/mirror/src/main/java/org/apache/kafka/connect/mirror/OffsetSyncStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,13 @@ public OptionalLong translateDownstream(String group, TopicPartition sourceTopic
// | /
// vv
// target |-sg----r-----|
long upstreamStep = upstreamOffset == offsetSync.get().upstreamOffset() ? 0 : 1;
long translatedDownstreamOffset = offsetSync.get().translateDownstream(upstreamOffset);
log.debug("translateDownstream({},{},{}): Translated {} (relative to {})",
group, sourceTopicPartition, upstreamOffset,
offsetSync.get().downstreamOffset() + upstreamStep,
translatedDownstreamOffset,
offsetSync.get()
);
return OptionalLong.of(offsetSync.get().downstreamOffset() + upstreamStep);
return OptionalLong.of(translatedDownstreamOffset);
} else {
log.debug("translateDownstream({},{},{}): Skipped (offset sync not found)",
group, sourceTopicPartition, upstreamOffset);
Expand Down
5 changes: 2 additions & 3 deletions connect/mirror/src/main/java/org/apache/kafka/connect/mirror/OffsetSyncWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,8 @@ static class PartitionState {
boolean update(long upstreamOffset, long downstreamOffset) {
// Emit an offset sync if any of the following conditions are true
boolean noPreviousSyncThisLifetime = lastSyncDownstreamOffset == -1L;
// the OffsetSync::translateDownstream method will translate this offset 1 past the last sync, so add 1.
// TODO: share common implementation to enforce this relationship
boolean translatedOffsetTooStale = downstreamOffset - (lastSyncDownstreamOffset + 1) >= maxOffsetLag;
// OffsetSync translates offsets after the last sync to one downstream offset past the sync.
boolean translatedOffsetTooStale = downstreamOffset - OffsetSync.downstreamOffsetAfterSync(lastSyncDownstreamOffset) >= maxOffsetLag;
boolean skippedUpstreamRecord = upstreamOffset - previousUpstreamOffset != 1L;
boolean truncatedDownstreamTopic = downstreamOffset < previousDownstreamOffset;
if (noPreviousSyncThisLifetime || translatedOffsetTooStale || skippedUpstreamRecord || truncatedDownstreamTopic) {
Expand Down
Loading