Skip to content

KAFKA-8715: fix timestamp bug for static member.id generation #7116

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
hachikuji merged 3 commits into from
Jul 26, 2019
Merged

KAFKA-8715: fix timestamp bug for static member.id generation #7116

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
0551907
fix timestamp bug
Jul 25, 2019
194ab9f
address comments
Jul 25, 2019
a2c7bd7
use uuid for all cases
Jul 26, 2019
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 core/src/main/scala/kafka/coordinator/group/GroupMetadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ private[group] class GroupMetadata(val groupId: String, initialState: GroupState
case None =>
clientId + GroupMetadata.MemberIdDelimiter + UUID.randomUUID().toString
case Some(instanceId) =>
instanceId + GroupMetadata.MemberIdDelimiter + currentStateTimestamp.get
instanceId + GroupMetadata.MemberIdDelimiter + UUID.randomUUID().toString
}
}

Expand Down
17 changes: 17 additions & 0 deletions core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,23 @@ class GroupCoordinatorTest {
assertEquals(Errors.FENCED_INSTANCE_ID, invalidHeartbeatResult)
}

@Test
def shouldGetDifferentStaticMemberIdAfterEachRejoin(): Unit = {
val initialResult = staticMembersJoinAndRebalance(leaderInstanceId, followerInstanceId)

val timeAdvance = 1
var lastMemberId = initialResult.leaderId
for (_ <- 1 to 5) {
EasyMock.reset(replicaManager)

val joinGroupResult = staticJoinGroup(groupId, JoinGroupRequest.UNKNOWN_MEMBER_ID,
leaderInstanceId, protocolType, protocols, clockAdvance = timeAdvance)
assertTrue(joinGroupResult.memberId.startsWith(leaderInstanceId.get))
assertNotEquals(lastMemberId, joinGroupResult.memberId)
lastMemberId = joinGroupResult.memberId
}
}

@Test
def testOffsetCommitDeadGroup() {
val memberId = "memberId"
Expand Down