You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by da...@apache.org on 2022/12/15 08:30:08 UTC
[kafka] branch trunk updated: KAFKA-14367; Add `DeleteGroups` to the new `GroupCoordinator` interface (#12858)
This is an automated email from the ASF dual-hosted git repository.
dajac pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new f8556fe7915 KAFKA-14367; Add `DeleteGroups` to the new `GroupCoordinator` interface (#12858)
f8556fe7915 is described below
commit f8556fe7915875a47dca7018f010bbc759c32baa
Author: David Jacot <dj...@confluent.io>
AuthorDate: Thu Dec 15 09:29:56 2022 +0100
KAFKA-14367; Add `DeleteGroups` to the new `GroupCoordinator` interface (#12858)
This patch adds `deleteGroups` to the new `GroupCoordinator` interface and updates `KafkaApis` to use it.
Reviewers: Omnia G H Ibrahim <o....@gmail.com>, Justine Olshan <jo...@confluent.io>, Jason Gustafson <ja...@confluent.io>
---
.../group/GroupCoordinatorAdapter.scala | 20 ++-
core/src/main/scala/kafka/server/KafkaApis.scala | 47 ++++---
.../group/GroupCoordinatorAdapterTest.scala | 37 ++++-
.../scala/unit/kafka/server/KafkaApisTest.scala | 152 +++++++++++++++++++++
.../kafka/coordinator/group/GroupCoordinator.java | 16 +++
5 files changed, 252 insertions(+), 20 deletions(-)
diff --git a/core/src/main/scala/kafka/coordinator/group/GroupCoordinatorAdapter.scala b/core/src/main/scala/kafka/coordinator/group/GroupCoordinatorAdapter.scala
index 0b48ab17a7a..4e96e4373a7 100644
--- a/core/src/main/scala/kafka/coordinator/group/GroupCoordinatorAdapter.scala
+++ b/core/src/main/scala/kafka/coordinator/group/GroupCoordinatorAdapter.scala
@@ -17,7 +17,8 @@
package kafka.coordinator.group
import kafka.server.RequestLocal
-import org.apache.kafka.common.message.{DescribeGroupsResponseData, HeartbeatRequestData, HeartbeatResponseData, JoinGroupRequestData, JoinGroupResponseData, LeaveGroupRequestData, LeaveGroupResponseData, ListGroupsRequestData, ListGroupsResponseData, SyncGroupRequestData, SyncGroupResponseData}
+import kafka.utils.Implicits.MapExtensionMethods
+import org.apache.kafka.common.message.{DeleteGroupsResponseData, DescribeGroupsResponseData, HeartbeatRequestData, HeartbeatResponseData, JoinGroupRequestData, JoinGroupResponseData, LeaveGroupRequestData, LeaveGroupResponseData, ListGroupsRequestData, ListGroupsResponseData, SyncGroupRequestData, SyncGroupResponseData}
import org.apache.kafka.common.requests.RequestContext
import org.apache.kafka.common.utils.BufferSupplier
@@ -216,4 +217,21 @@ class GroupCoordinatorAdapter(
CompletableFuture.completedFuture(groupIds.asScala.map(describeGroup).asJava)
}
+
+ override def deleteGroups(
+ context: RequestContext,
+ groupIds: util.List[String],
+ bufferSupplier: BufferSupplier
+ ): CompletableFuture[DeleteGroupsResponseData.DeletableGroupResultCollection] = {
+ val results = new DeleteGroupsResponseData.DeletableGroupResultCollection()
+ coordinator.handleDeleteGroups(
+ groupIds.asScala.toSet,
+ RequestLocal(bufferSupplier)
+ ).forKeyValue { (groupId, error) =>
+ results.add(new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId(groupId)
+ .setErrorCode(error.code))
+ }
+ CompletableFuture.completedFuture(results)
+ }
}
diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala b/core/src/main/scala/kafka/server/KafkaApis.scala
index e9f07babe4f..ad3d5a85d35 100644
--- a/core/src/main/scala/kafka/server/KafkaApis.scala
+++ b/core/src/main/scala/kafka/server/KafkaApis.scala
@@ -43,7 +43,6 @@ import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData.{
import org.apache.kafka.common.message.CreatePartitionsResponseData.CreatePartitionsTopicResult
import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic
import org.apache.kafka.common.message.CreateTopicsResponseData.{CreatableTopicResult, CreatableTopicResultCollection}
-import org.apache.kafka.common.message.DeleteGroupsResponseData.{DeletableGroupResult, DeletableGroupResultCollection}
import org.apache.kafka.common.message.DeleteRecordsResponseData.{DeleteRecordsPartitionResult, DeleteRecordsTopicResult}
import org.apache.kafka.common.message.DeleteTopicsResponseData.{DeletableTopicResult, DeletableTopicResultCollection}
import org.apache.kafka.common.message.ElectLeadersResponseData.{PartitionResult, ReplicaElectionResult}
@@ -224,7 +223,7 @@ class KafkaApis(val requestChannel: RequestChannel,
case ApiKeys.RENEW_DELEGATION_TOKEN => maybeForwardToController(request, handleRenewTokenRequest)
case ApiKeys.EXPIRE_DELEGATION_TOKEN => maybeForwardToController(request, handleExpireTokenRequest)
case ApiKeys.DESCRIBE_DELEGATION_TOKEN => handleDescribeTokensRequest(request)
- case ApiKeys.DELETE_GROUPS => handleDeleteGroupsRequest(request, requestLocal)
+ case ApiKeys.DELETE_GROUPS => handleDeleteGroupsRequest(request, requestLocal).exceptionally(handleError)
case ApiKeys.ELECT_LEADERS => maybeForwardToController(request, handleElectLeaders)
case ApiKeys.INCREMENTAL_ALTER_CONFIGS => handleIncrementalAlterConfigsRequest(request)
case ApiKeys.ALTER_PARTITION_REASSIGNMENTS => maybeForwardToController(request, handleAlterPartitionReassignmentsRequest)
@@ -1710,30 +1709,42 @@ class KafkaApis(val requestChannel: RequestChannel,
}
}
- def handleDeleteGroupsRequest(request: RequestChannel.Request, requestLocal: RequestLocal): Unit = {
+ def handleDeleteGroupsRequest(
+ request: RequestChannel.Request,
+ requestLocal: RequestLocal
+ ): CompletableFuture[Unit] = {
val deleteGroupsRequest = request.body[DeleteGroupsRequest]
val groups = deleteGroupsRequest.data.groupsNames.asScala.distinct
- val (authorizedGroups, unauthorizedGroups) = authHelper.partitionSeqByAuthorized(request.context, DELETE, GROUP,
- groups)(identity)
+ val (authorizedGroups, unauthorizedGroups) =
+ authHelper.partitionSeqByAuthorized(request.context, DELETE, GROUP, groups)(identity)
- val groupDeletionResult = groupCoordinator.handleDeleteGroups(authorizedGroups.toSet, requestLocal) ++
- unauthorizedGroups.map(_ -> Errors.GROUP_AUTHORIZATION_FAILED)
+ newGroupCoordinator.deleteGroups(
+ request.context,
+ authorizedGroups.toList.asJava,
+ requestLocal.bufferSupplier
+ ).handle[Unit] { (results, exception) =>
+ val response = new DeleteGroupsResponseData()
- requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs => {
- val deletionCollections = new DeletableGroupResultCollection()
- groupDeletionResult.forKeyValue { (groupId, error) =>
- deletionCollections.add(new DeletableGroupResult()
+ if (exception != null) {
+ val error = Errors.forException(exception)
+ authorizedGroups.foreach { groupId =>
+ response.results.add(new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId(groupId)
+ .setErrorCode(error.code))
+ }
+ } else {
+ response.setResults(results)
+ }
+
+ unauthorizedGroups.foreach { groupId =>
+ response.results.add(new DeleteGroupsResponseData.DeletableGroupResult()
.setGroupId(groupId)
- .setErrorCode(error.code)
- )
+ .setErrorCode(Errors.GROUP_AUTHORIZATION_FAILED.code))
}
- new DeleteGroupsResponse(new DeleteGroupsResponseData()
- .setResults(deletionCollections)
- .setThrottleTimeMs(requestThrottleMs)
- )
- })
+ requestHelper.sendMaybeThrottle(request, new DeleteGroupsResponse(response))
+ }
}
def handleHeartbeatRequest(request: RequestChannel.Request): CompletableFuture[Unit] = {
diff --git a/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorAdapterTest.scala b/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorAdapterTest.scala
index 742895bd2ae..323547474c9 100644
--- a/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorAdapterTest.scala
+++ b/core/src/test/scala/unit/kafka/coordinator/group/GroupCoordinatorAdapterTest.scala
@@ -18,7 +18,7 @@ package kafka.coordinator.group
import kafka.coordinator.group.GroupCoordinatorConcurrencyTest.{JoinGroupCallback, SyncGroupCallback}
import kafka.server.RequestLocal
-import org.apache.kafka.common.message.{DescribeGroupsResponseData, HeartbeatRequestData, HeartbeatResponseData, JoinGroupRequestData, JoinGroupResponseData, LeaveGroupRequestData, LeaveGroupResponseData, ListGroupsRequestData, ListGroupsResponseData, SyncGroupRequestData, SyncGroupResponseData}
+import org.apache.kafka.common.message.{DeleteGroupsResponseData, DescribeGroupsResponseData, HeartbeatRequestData, HeartbeatResponseData, JoinGroupRequestData, JoinGroupResponseData, LeaveGroupRequestData, LeaveGroupResponseData, ListGroupsRequestData, ListGroupsResponseData, SyncGroupRequestData, SyncGroupResponseData}
import org.apache.kafka.common.message.JoinGroupRequestData.JoinGroupRequestProtocol
import org.apache.kafka.common.message.JoinGroupResponseData.JoinGroupResponseMember
import org.apache.kafka.common.network.{ClientInformation, ListenerName}
@@ -401,4 +401,39 @@ class GroupCoordinatorAdapterTest {
assertEquals(expectedDescribedGroups, future.get())
}
+
+ @Test
+ def testDeleteGroups(): Unit = {
+ val groupCoordinator = mock(classOf[GroupCoordinator])
+ val adapter = new GroupCoordinatorAdapter(groupCoordinator)
+
+ val ctx = makeContext(ApiKeys.DELETE_GROUPS, ApiKeys.DELETE_GROUPS.latestVersion)
+ val groupIds = List("group-1", "group-2", "group-3")
+ val bufferSupplier = BufferSupplier.create()
+
+ when(groupCoordinator.handleDeleteGroups(
+ groupIds.toSet,
+ RequestLocal(bufferSupplier)
+ )).thenReturn(Map(
+ "group-1" -> Errors.NONE,
+ "group-2" -> Errors.NOT_COORDINATOR,
+ "group-3" -> Errors.INVALID_GROUP_ID,
+ ))
+
+ val future = adapter.deleteGroups(ctx, groupIds.asJava, bufferSupplier)
+ assertTrue(future.isDone)
+
+ val expectedResults = new DeleteGroupsResponseData.DeletableGroupResultCollection()
+ expectedResults.add(new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-1")
+ .setErrorCode(Errors.NONE.code))
+ expectedResults.add(new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-2")
+ .setErrorCode(Errors.NOT_COORDINATOR.code))
+ expectedResults.add(new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-3")
+ .setErrorCode(Errors.INVALID_GROUP_ID.code))
+
+ assertEquals(expectedResults, future.get())
+ }
}
diff --git a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
index 64a8d1881cd..d8c9c393ae7 100644
--- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
+++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
@@ -1990,6 +1990,158 @@ class KafkaApisTest {
testListOffsetFailedGetLeaderReplica(Errors.UNKNOWN_TOPIC_OR_PARTITION)
}
+ @Test
+ def testHandleDeleteGroups(): Unit = {
+ val deleteGroupsRequest = new DeleteGroupsRequestData().setGroupsNames(List(
+ "group-1",
+ "group-2",
+ "group-3"
+ ).asJava)
+
+ val requestChannelRequest = buildRequest(new DeleteGroupsRequest.Builder(deleteGroupsRequest).build())
+
+ val future = new CompletableFuture[DeleteGroupsResponseData.DeletableGroupResultCollection]()
+ when(newGroupCoordinator.deleteGroups(
+ requestChannelRequest.context,
+ List("group-1", "group-2", "group-3").asJava,
+ RequestLocal.NoCaching.bufferSupplier
+ )).thenReturn(future)
+
+ createKafkaApis().handleDeleteGroupsRequest(
+ requestChannelRequest,
+ RequestLocal.NoCaching
+ )
+
+ val results = new DeleteGroupsResponseData.DeletableGroupResultCollection(List(
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-1")
+ .setErrorCode(Errors.NONE.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-2")
+ .setErrorCode(Errors.NOT_CONTROLLER.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-3")
+ .setErrorCode(Errors.UNKNOWN_SERVER_ERROR.code),
+ ).iterator.asJava)
+
+ future.complete(results)
+
+ val expectedDeleteGroupsResponse = new DeleteGroupsResponseData()
+ .setResults(results)
+
+ val capturedResponse = verifyNoThrottling(requestChannelRequest)
+ val response = capturedResponse.getValue.asInstanceOf[DeleteGroupsResponse]
+ assertEquals(expectedDeleteGroupsResponse, response.data)
+ }
+
+ @Test
+ def testHandleDeleteGroupsFutureFailed(): Unit = {
+ val deleteGroupsRequest = new DeleteGroupsRequestData().setGroupsNames(List(
+ "group-1",
+ "group-2",
+ "group-3"
+ ).asJava)
+
+ val requestChannelRequest = buildRequest(new DeleteGroupsRequest.Builder(deleteGroupsRequest).build())
+
+ val future = new CompletableFuture[DeleteGroupsResponseData.DeletableGroupResultCollection]()
+ when(newGroupCoordinator.deleteGroups(
+ requestChannelRequest.context,
+ List("group-1", "group-2", "group-3").asJava,
+ RequestLocal.NoCaching.bufferSupplier
+ )).thenReturn(future)
+
+ createKafkaApis().handleDeleteGroupsRequest(
+ requestChannelRequest,
+ RequestLocal.NoCaching
+ )
+
+ future.completeExceptionally(Errors.NOT_CONTROLLER.exception)
+
+ val expectedDeleteGroupsResponse = new DeleteGroupsResponseData()
+ .setResults(new DeleteGroupsResponseData.DeletableGroupResultCollection(List(
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-1")
+ .setErrorCode(Errors.NOT_CONTROLLER.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-2")
+ .setErrorCode(Errors.NOT_CONTROLLER.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-3")
+ .setErrorCode(Errors.NOT_CONTROLLER.code),
+ ).iterator.asJava))
+
+ val capturedResponse = verifyNoThrottling(requestChannelRequest)
+ val response = capturedResponse.getValue.asInstanceOf[DeleteGroupsResponse]
+ assertEquals(expectedDeleteGroupsResponse, response.data)
+ }
+
+ @Test
+ def testHandleDeleteGroupsAuthenticationFailed(): Unit = {
+ val deleteGroupsRequest = new DeleteGroupsRequestData().setGroupsNames(List(
+ "group-1",
+ "group-2",
+ "group-3"
+ ).asJava)
+
+ val requestChannelRequest = buildRequest(new DeleteGroupsRequest.Builder(deleteGroupsRequest).build())
+
+ val authorizer: Authorizer = mock(classOf[Authorizer])
+
+ val acls = Map(
+ "group-1" -> AuthorizationResult.DENIED,
+ "group-2" -> AuthorizationResult.ALLOWED,
+ "group-3" -> AuthorizationResult.ALLOWED
+ )
+
+ when(authorizer.authorize(
+ any[RequestContext],
+ any[util.List[Action]]
+ )).thenAnswer { invocation =>
+ val actions = invocation.getArgument(1, classOf[util.List[Action]])
+ actions.asScala.map { action =>
+ acls.getOrElse(action.resourcePattern.name, AuthorizationResult.DENIED)
+ }.asJava
+ }
+
+ val future = new CompletableFuture[DeleteGroupsResponseData.DeletableGroupResultCollection]()
+ when(newGroupCoordinator.deleteGroups(
+ requestChannelRequest.context,
+ List("group-2", "group-3").asJava,
+ RequestLocal.NoCaching.bufferSupplier
+ )).thenReturn(future)
+
+ createKafkaApis(authorizer = Some(authorizer)).handleDeleteGroupsRequest(
+ requestChannelRequest,
+ RequestLocal.NoCaching
+ )
+
+ future.complete(new DeleteGroupsResponseData.DeletableGroupResultCollection(List(
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-2")
+ .setErrorCode(Errors.NONE.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-3")
+ .setErrorCode(Errors.NONE.code)
+ ).iterator.asJava))
+
+ val expectedDeleteGroupsResponse = new DeleteGroupsResponseData()
+ .setResults(new DeleteGroupsResponseData.DeletableGroupResultCollection(List(
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-2")
+ .setErrorCode(Errors.NONE.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-3")
+ .setErrorCode(Errors.NONE.code),
+ new DeleteGroupsResponseData.DeletableGroupResult()
+ .setGroupId("group-1")
+ .setErrorCode(Errors.GROUP_AUTHORIZATION_FAILED.code)).iterator.asJava))
+
+ val capturedResponse = verifyNoThrottling(requestChannelRequest)
+ val response = capturedResponse.getValue.asInstanceOf[DeleteGroupsResponse]
+ assertEquals(expectedDeleteGroupsResponse, response.data)
+ }
+
@Test
def testHandleDescribeGroups(): Unit = {
val describeGroupsRequest = new DescribeGroupsRequestData().setGroups(List(
diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
index f9501ec59e1..1faa8a07fac 100644
--- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
+++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
@@ -16,6 +16,7 @@
*/
package org.apache.kafka.coordinator.group;
+import org.apache.kafka.common.message.DeleteGroupsResponseData;
import org.apache.kafka.common.message.DescribeGroupsResponseData;
import org.apache.kafka.common.message.HeartbeatRequestData;
import org.apache.kafka.common.message.HeartbeatResponseData;
@@ -116,5 +117,20 @@ public interface GroupCoordinator {
RequestContext context,
List<String> groupIds
);
+
+ /**
+ * Delete Groups.
+ *
+ * @param context The request context.
+ * @param groupIds The group ids.
+ * @param bufferSupplier The buffer supplier tight to the request thread.
+ *
+ * @return A future yielding the results or an exception.
+ */
+ CompletableFuture<DeleteGroupsResponseData.DeletableGroupResultCollection> deleteGroups(
+ RequestContext context,
+ List<String> groupIds,
+ BufferSupplier bufferSupplier
+ );
}