chia7712 commented on code in PR #18456:
URL: https://github.com/apache/kafka/pull/18456#discussion_r1910540556
##########
core/src/main/scala/kafka/server/KafkaApis.scala:
##########
@@ -3208,35 +3208,18 @@ class KafkaApis(val requestChannel: RequestChannel,
describeUserScramCredentialsRequest.getErrorResponse(requestThrottleMs,
Errors.CLUSTER_AUTHORIZATION_FAILED.exception))
} else {
metadataSupport match {
- case ZkSupport(adminManager, controller, zkClient, forwardingManager,
metadataCache, _) =>
- val result = adminManager.describeUserScramCredentials(
-
Option(describeUserScramCredentialsRequest.data.users).map(_.asScala.map(_.name).toList))
- requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs =>
- new
DescribeUserScramCredentialsResponse(result.setThrottleTimeMs(requestThrottleMs)))
case RaftSupport(_, metadataCache) =>
val result =
metadataCache.describeScramCredentials(describeUserScramCredentialsRequest.data())
requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs =>
new
DescribeUserScramCredentialsResponse(result.setThrottleTimeMs(requestThrottleMs)))
+ case _ =>
+ throw KafkaApis.shouldNeverReceive(request)
}
}
}
def handleAlterUserScramCredentialsRequest(request: RequestChannel.Request):
Unit = {
- val zkSupport =
metadataSupport.requireZkOrThrow(KafkaApis.shouldAlwaysForward(request))
- val alterUserScramCredentialsRequest =
request.body[AlterUserScramCredentialsRequest]
-
- if (!zkSupport.controller.isActive) {
- requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs =>
- alterUserScramCredentialsRequest.getErrorResponse(requestThrottleMs,
Errors.NOT_CONTROLLER.exception))
- } else if (authHelper.authorize(request.context, ALTER, CLUSTER,
CLUSTER_NAME)) {
- val result = zkSupport.adminManager.alterUserScramCredentials(
- alterUserScramCredentialsRequest.data.upsertions().asScala,
alterUserScramCredentialsRequest.data.deletions().asScala)
- requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs =>
- new
AlterUserScramCredentialsResponse(result.setThrottleTimeMs(requestThrottleMs)))
- } else {
- requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs =>
- alterUserScramCredentialsRequest.getErrorResponse(requestThrottleMs,
Errors.CLUSTER_AUTHORIZATION_FAILED.exception))
- }
+ throw KafkaApis.shouldAlwaysForward(request)
Review Comment:
@frankvicky Could you please refactor `maybeForwardToController` to
`forwardToController`? We will remove all zk-releated handlers, so it is fine
to do refactor in this PR. With that change, the handle
`handleAlterUserScramCredentialsRequest` can be removed directly
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
