root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Fix typo in heartbeat request protocol definition (#6759) 

This changes the field "generationid" to "generationId" to be consistent with other uses.

Reviewers: Shaobo Liu <lambda.tencent@gmail.com>, Jason Gustafson <jason@confluent.io>
This commit is contained in:
Boyang Chen 2019-05-18 16:20:00 -07:00 committed by Jason Gustafson
parent a29a005316
commit e00c0d316d
8 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java
View File

@ -905,9 +905,9 @@ public abstract class AbstractCoordinator implements Closeable {
HeartbeatRequest.Builder requestBuilder = HeartbeatRequest.Builder requestBuilder =
new HeartbeatRequest.Builder(new HeartbeatRequestData() new HeartbeatRequest.Builder(new HeartbeatRequestData()
.setGroupId(groupId) .setGroupId(groupId)
.setGenerationid(this.generation.generationId) .setMemberId(this.generation.memberId)
.setGroupInstanceId(this.groupInstanceId.orElse(null)) .setGroupInstanceId(this.groupInstanceId.orElse(null))
.setMemberId(this.generation.memberId)); .setGenerationId(this.generation.generationId));
return client.send(coordinator, requestBuilder) return client.send(coordinator, requestBuilder)
.compose(new HeartbeatResponseHandler()); .compose(new HeartbeatResponseHandler());
} }

2
clients/src/main/resources/common/message/HeartbeatRequest.json
View File

@ -23,7 +23,7 @@
"fields": [ "fields": [
{ "name": "GroupId", "type": "string", "versions": "0+", "entityType": "groupId", { "name": "GroupId", "type": "string", "versions": "0+", "entityType": "groupId",
"about": "The group id." }, "about": "The group id." },
{ "name": "Generationid", "type": "int32", "versions": "0+", { "name": "GenerationId", "type": "int32", "versions": "0+",
"about": "The generation of the group." }, "about": "The generation of the group." },
{ "name": "MemberId", "type": "string", "versions": "0+", { "name": "MemberId", "type": "string", "versions": "0+",
"about": "The member ID." }, "about": "The member ID." },

2
clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java
View File

@ -417,7 +417,7 @@ public class ConsumerNetworkClientTest {
private HeartbeatRequest.Builder heartbeat() { private HeartbeatRequest.Builder heartbeat() {
return new HeartbeatRequest.Builder(new HeartbeatRequestData() return new HeartbeatRequest.Builder(new HeartbeatRequestData()
.setGroupId("group") .setGroupId("group")
.setGenerationid(1) .setGenerationId(1)
.setMemberId("memberId")); .setMemberId("memberId"));
} }

2
clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
View File

@ -776,7 +776,7 @@ public class RequestResponseTest {
private HeartbeatRequest createHeartBeatRequest() { private HeartbeatRequest createHeartBeatRequest() {
return new HeartbeatRequest.Builder(new HeartbeatRequestData() return new HeartbeatRequest.Builder(new HeartbeatRequestData()
.setGroupId("group1") .setGroupId("group1")
.setGenerationid(1) .setGenerationId(1)
.setMemberId("consumer1")).build(); .setMemberId("consumer1")).build();
} }

2
core/src/main/scala/kafka/server/KafkaApis.scala
View File

@ -1476,7 +1476,7 @@ class KafkaApis(val requestChannel: RequestChannel,
heartbeatRequest.data.groupId, heartbeatRequest.data.groupId,
heartbeatRequest.data.memberId, heartbeatRequest.data.memberId,
Option(heartbeatRequest.data.groupInstanceId), Option(heartbeatRequest.data.groupInstanceId),
heartbeatRequest.data.generationid, heartbeatRequest.data.generationId,
sendResponseCallback) sendResponseCallback)
} }
} }

11
core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala
View File

@ -380,9 +380,16 @@ class AuthorizerIntegrationTest extends BaseRequestTest {
).build() ).build()
} }
private def heartbeatRequest = new HeartbeatRequest.Builder(new HeartbeatRequestData().setGroupId(group).setGenerationid(1).setMemberId("")).build() private def heartbeatRequest = new HeartbeatRequest.Builder(
new HeartbeatRequestData()
.setGroupId(group)
.setGenerationId(1)
.setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)).build()
private def leaveGroupRequest = new LeaveGroupRequest.Builder(new LeaveGroupRequestData().setGroupId(group).setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)).build() private def leaveGroupRequest = new LeaveGroupRequest.Builder(
new LeaveGroupRequestData()
.setGroupId(group)
.setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)).build()
private def deleteGroupsRequest = new DeleteGroupsRequest.Builder(Set(group).asJava).build() private def deleteGroupsRequest = new DeleteGroupsRequest.Builder(Set(group).asJava).build()

2
core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
View File

@ -593,7 +593,7 @@ class KafkaApisTest {
.setGroupId("test") .setGroupId("test")
.setMemberId("test") .setMemberId("test")
.setGroupInstanceId("instanceId") .setGroupInstanceId("instanceId")
.setGenerationid(1) .setGenerationId(1)
)) ))
createKafkaApis(KAFKA_2_2_IV1).handleHeartbeatRequest(requestChannelRequest) createKafkaApis(KAFKA_2_2_IV1).handleHeartbeatRequest(requestChannelRequest)

13
core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
View File

@ -300,10 +300,19 @@ class RequestQuotaTest extends BaseRequestTest {
) )
case ApiKeys.HEARTBEAT => case ApiKeys.HEARTBEAT =>
new HeartbeatRequest.Builder(new HeartbeatRequestData().setGroupId("test-group").setGenerationid(1).setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)) new HeartbeatRequest.Builder(
new HeartbeatRequestData()
.setGroupId("test-group")
.setGenerationId(1)
.setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)
)
case ApiKeys.LEAVE_GROUP => case ApiKeys.LEAVE_GROUP =>
new LeaveGroupRequest.Builder(new LeaveGroupRequestData().setGroupId("test-leave-group").setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)) new LeaveGroupRequest.Builder(
new LeaveGroupRequestData()
.setGroupId("test-leave-group")
.setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID)
)
case ApiKeys.SYNC_GROUP => case ApiKeys.SYNC_GROUP =>
new SyncGroupRequest.Builder( new SyncGroupRequest.Builder(