Skip to content

Fix: Update OffsetCommit CommittedLeaderEpoch to v6 #1335

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
petedannemann merged 3 commits into from
May 15, 2025
Merged

Fix: Update OffsetCommit CommittedLeaderEpoch to v6 #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b649bde
Update OffsetCommit CommittedLeaderEpoch to v6, fixes #1334
LeonHartley Sep 24, 2024
2776ab2
Merge branch 'segmentio:main' into main
LeonHartley May 15, 2025
d420547
update OffsetCommitRequest test to use correct protocol version
LeonHartley May 15, 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
2 changes: 1 addition & 1 deletion protocol/offsetcommit/offsetcommit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type RequestPartition struct {
PartitionIndex int32 `kafka:"min=v0,max=v7"`
CommittedOffset int64 `kafka:"min=v0,max=v7"`
CommitTimestamp int64 `kafka:"min=v1,max=v1"`
CommittedLeaderEpoch int32 `kafka:"min=v5,max=v7"`
CommittedLeaderEpoch int32 `kafka:"min=v6,max=v7"`
CommittedMetadata string `kafka:"min=v0,max=v7,nullable"`
}

Expand Down
46 changes: 35 additions & 11 deletions protocol/offsetcommit/offsetcommit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,30 +93,54 @@ func TestOffsetCommitRequest(t *testing.T) {
})
}

// Version 5 added:
// RequestTopic.RequestPartition.CommitedLeaderEpoc
// Version 5 removed:
// RetentionTimeMs
// Fields are the same through version 6.
for _, version := range []int16{5, 6} {
for _, version := range []int16{5} {
prototest.TestRequest(t, version, &offsetcommit.Request{
GroupID: "group-3",
GenerationID: 1,
MemberID: "member-3",
Topics: []offsetcommit.RequestTopic{
{
Name: "topic-3",
Partitions: []offsetcommit.RequestPartition{
{
PartitionIndex: 0,
CommittedOffset: 1,
CommittedMetadata: "meta-3-0",
},
{
PartitionIndex: 1,
CommittedOffset: 2,
CommittedMetadata: "meta-3-1",
},
},
},
},
})
}

// Version 6 added:
// RequestTopic.RequestPartition.CommittedLeaderEpoch
for _, version := range []int16{6} {
prototest.TestRequest(t, version, &offsetcommit.Request{
GroupID: "group-4",
GenerationID: 1,
MemberID: "member-4",
Topics: []offsetcommit.RequestTopic{
{
Name: "topic-4",
Partitions: []offsetcommit.RequestPartition{
{
PartitionIndex: 0,
CommittedOffset: 1,
CommittedMetadata: "meta-3-0",
CommittedMetadata: "meta-4-0",
CommittedLeaderEpoch: 10,
},
{
PartitionIndex: 1,
CommittedOffset: 2,
CommittedMetadata: "meta-3-1",
CommittedMetadata: "meta-4-1",
CommittedLeaderEpoch: 11,
},
},
Expand All @@ -129,24 +153,24 @@ func TestOffsetCommitRequest(t *testing.T) {
// GroupInstanceID
for _, version := range []int16{7} {
prototest.TestRequest(t, version, &offsetcommit.Request{
GroupID: "group-4",
GroupID: "group-5",
GenerationID: 1,
MemberID: "member-4",
GroupInstanceID: "instance-4",
MemberID: "member-5",
GroupInstanceID: "instance-5",
Topics: []offsetcommit.RequestTopic{
{
Name: "topic-4",
Partitions: []offsetcommit.RequestPartition{
{
PartitionIndex: 0,
CommittedOffset: 1,
CommittedMetadata: "meta-4-0",
CommittedMetadata: "meta-5-0",
CommittedLeaderEpoch: 10,
},
{
PartitionIndex: 1,
CommittedOffset: 2,
CommittedMetadata: "meta-4-1",
CommittedMetadata: "meta-5-1",
CommittedLeaderEpoch: 11,
},
},
Expand Down