dajac commented on code in PR #12845: URL: https://github.com/apache/kafka/pull/12845#discussion_r1027049342
########## core/src/main/scala/kafka/server/KafkaApis.scala: ########## @@ -1647,69 +1656,51 @@ class KafkaApis(val requestChannel: RequestChannel, } } - def handleJoinGroupRequest(request: RequestChannel.Request, requestLocal: RequestLocal): Unit = { - val joinGroupRequest = request.body[JoinGroupRequest] + private def makeGroupCoordinatorRequestContext( + request: RequestChannel.Request, + requestLocal: RequestLocal + ): GroupCoordinatorRequestContext = { + new GroupCoordinatorRequestContext( + request.context.header.data.requestApiVersion, + request.context.header.data.clientId, + request.context.clientAddress, + requestLocal.bufferSupplier + ) + } - // the callback for sending a join-group response - def sendResponseCallback(joinResult: JoinGroupResult): Unit = { - def createResponse(requestThrottleMs: Int): AbstractResponse = { - val responseBody = new JoinGroupResponse( - new JoinGroupResponseData() - .setThrottleTimeMs(requestThrottleMs) - .setErrorCode(joinResult.error.code) - .setGenerationId(joinResult.generationId) - .setProtocolType(joinResult.protocolType.orNull) - .setProtocolName(joinResult.protocolName.orNull) - .setLeader(joinResult.leaderId) - .setSkipAssignment(joinResult.skipAssignment) - .setMemberId(joinResult.memberId) - .setMembers(joinResult.members.asJava), - request.context.apiVersion - ) + def handleJoinGroupRequest( + request: RequestChannel.Request, + requestLocal: RequestLocal + ): CompletableFuture[Unit] = { + val joinGroupRequest = request.body[JoinGroupRequest] - trace("Sending join group response %s for correlation id %d to client %s." - .format(responseBody, request.header.correlationId, request.header.clientId)) - responseBody - } - requestHelper.sendResponseMaybeThrottle(request, createResponse) + def sendResponse(response: AbstractResponse): Unit = { + trace("Sending join group response %s for correlation id %d to client %s." + .format(response, request.header.correlationId, request.header.clientId)) + requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs => { + response.maybeSetThrottleTimeMs(requestThrottleMs) + response + }) } if (joinGroupRequest.data.groupInstanceId != null && config.interBrokerProtocolVersion.isLessThan(IBP_2_3_IV0)) { // Only enable static membership when IBP >= 2.3, because it is not safe for the broker to use the static member logic // until we are sure that all brokers support it. If static group being loaded by an older coordinator, it will discard // the group.instance.id field, so static members could accidentally become "dynamic", which leads to wrong states. - sendResponseCallback(JoinGroupResult(JoinGroupRequest.UNKNOWN_MEMBER_ID, Errors.UNSUPPORTED_VERSION)) + sendResponse(joinGroupRequest.getErrorResponse(Errors.UNSUPPORTED_VERSION.exception)) + CompletableFuture.completedFuture[Unit](()) Review Comment: All handlers are already surrounded by a try..catch that catches all the exceptions raised. We just need to ensure that exceptions raised in futures’ callbacks are also caught. In this particular case, any exceptions raised by sendResponse would be caught by that try..catch. -- 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