Skip to content

Start from historical messages if no consumer offsets were committed #613

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
jfallows merged 4 commits into from
Dec 4, 2023
Merged

Start from historical messages if no consumer offsets were committed #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
597dcd2
Start from historical offset if the group has no commit history
akrambek Dec 4, 2023
a186453
Merge branch 'feature/mqtt-kafka' of https://github.com/aklivity/zill…
akrambek Dec 4, 2023
38d32ad
Rename the protocol
akrambek Dec 4, 2023
d471fd0
Update scripts
akrambek Dec 4, 2023
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
2 changes: 1 addition & 1 deletion ...aklivity/zilla/runtime/binding/kafka/internal/stream/KafkaCacheServerConsumerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ private void doConsumerInitialBegin(
.typeId(kafkaTypeId)
.group(g ->
g.groupId(groupId)
.protocol("highlander")
.protocol("rebalance")
.timeout(timeout)
.metadataLen(metadata.sizeof())
.metadata(metadata.buffer(), 0, metadata.sizeof()))
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/io/aklivity/zilla/runtime/binding/kafka/internal/stream/KafkaMergedFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ private void onTopicOffsetFetchDataChanged(
partitions.forEach(p -> offsetsByPartitionId.put(p.partitionId(),
new KafkaPartitionOffset(
p.partitionId(),
p.partitionOffset(),
p.partitionOffset() == LIVE.value() ? HISTORICAL.value() : p.partitionOffset(),
0,
p.leaderEpoch(),
p.metadata().asString())));
Expand Down
4 changes: 2 additions & 2 deletions ...s/binding/kafka/streams/application/consumer/commit.acknowledge.message.offset/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -40,7 +40,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
4 changes: 2 additions & 2 deletions ...s/binding/kafka/streams/application/consumer/commit.acknowledge.message.offset/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -44,7 +44,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
2 changes: 1 addition & 1 deletion ...ivity/zilla/specs/binding/kafka/streams/application/group/partition.assignment/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand Down
2 changes: 1 addition & 1 deletion ...ivity/zilla/specs/binding/kafka/streams/application/group/partition.assignment/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand Down
4 changes: 2 additions & 2 deletions ...klivity/zilla/specs/binding/kafka/streams/application/group/reassign.new.topic/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -40,7 +40,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
4 changes: 2 additions & 2 deletions ...klivity/zilla/specs/binding/kafka/streams/application/group/reassign.new.topic/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -44,7 +44,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
4 changes: 2 additions & 2 deletions ...pecs/binding/kafka/streams/application/merged/unmerged.group.fetch.message.ack/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -134,7 +134,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(30000)
.build()
.build()}
Expand Down
4 changes: 2 additions & 2 deletions ...pecs/binding/kafka/streams/application/merged/unmerged.group.fetch.message.ack/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -132,7 +132,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
4 changes: 2 additions & 2 deletions ...cs/binding/kafka/streams/application/merged/unmerged.group.fetch.message.value/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -134,7 +134,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
4 changes: 2 additions & 2 deletions ...cs/binding/kafka/streams/application/merged/unmerged.group.fetch.message.value/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(45000)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -133,7 +133,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.instanceId("zilla")
.timeout(30000)
.build()
Expand Down
4 changes: 2 additions & 2 deletions ...ding/kafka/streams/application/merged/unmerged.group.produce.invalid.partition/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(0)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -132,7 +132,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(30000)
.build()
.build()}
Expand Down
4 changes: 2 additions & 2 deletions ...ding/kafka/streams/application/merged/unmerged.group.produce.invalid.partition/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(0)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -133,7 +133,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(30000)
.build()
.build()}
Expand Down
4 changes: 2 additions & 2 deletions .../binding/kafka/streams/application/merged/unmerged.group.produce.message.value/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(0)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -132,7 +132,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(30000)
.build()
.build()}
Expand Down
4 changes: 2 additions & 2 deletions .../binding/kafka/streams/application/merged/unmerged.group.produce.message.value/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ read zilla:begin.ext ${kafka:matchBeginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(0)
.metadata(kafka:memberMetadata()
.consumerId("consumer-1")
Expand All @@ -133,7 +133,7 @@ write zilla:begin.ext ${kafka:beginEx()
.typeId(zilla:id("kafka"))
.group()
.groupId("client-1")
.protocol("highlander")
.protocol("rebalance")
.timeout(30000)
.build()
.build()}
Expand Down