otterc commented on code in PR #2123:
URL:
https://github.com/apache/incubator-celeborn/pull/2123#discussion_r1412823809
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/FetchHandler.scala:
##########
@@ -95,54 +102,55 @@ class FetchHandler(
handleReadAddCredit(r.getCredit, r.getStreamId)
case r: ChunkFetchRequest =>
handleChunkFetchRequest(client, r.streamChunkSlice, r)
- case r: RpcRequest =>
- handleRpcRequest(client, r)
case unknown: RequestMessage =>
throw new IllegalArgumentException(s"Unknown message type id:
${unknown.`type`.id}")
}
}
- private def handleRpcRequest(client: TransportClient, rpcRequest:
RpcRequest): Unit = {
+ private def handleRpcRequest(
+ client: TransportClient,
+ rpcRequest: RpcRequest,
+ callback: RpcResponseCallback): Unit = {
+ var message: GeneratedMessageV3 = null
try {
- var message: GeneratedMessageV3 = null
- try {
- message =
TransportMessage.fromByteBuffer(rpcRequest.body().nioByteBuffer())
- .getParsedPayload[GeneratedMessageV3]
- } catch {
- case exception: CelebornIOException =>
- logWarning("Handle request with legacy RPCs", exception)
- return handleLegacyRpcMessage(client, rpcRequest)
- }
- message match {
- case openStream: PbOpenStream =>
- handleOpenStreamInternal(
- client,
- openStream.getShuffleKey,
- openStream.getFileName,
- openStream.getStartIndex,
- openStream.getEndIndex,
- openStream.getInitialCredit,
- rpcRequest.requestId,
- isLegacy = false,
- openStream.getReadLocalShuffle)
- case bufferStreamEnd: PbBufferStreamEnd =>
- handleEndStreamFromClient(bufferStreamEnd.getStreamId,
bufferStreamEnd.getStreamType)
- case readAddCredit: PbReadAddCredit =>
- handleReadAddCredit(readAddCredit.getCredit,
readAddCredit.getStreamId)
- case chunkFetchRequest: PbChunkFetchRequest =>
- handleChunkFetchRequest(
- client,
- StreamChunkSlice.fromProto(chunkFetchRequest.getStreamChunkSlice),
- rpcRequest)
- case message: GeneratedMessageV3 =>
- logError(s"Unknown message $message")
- }
- } finally {
- rpcRequest.body().release()
+ message =
TransportMessage.fromByteBuffer(rpcRequest.body().nioByteBuffer())
+ .getParsedPayload[GeneratedMessageV3]
+ } catch {
+ case exception: CelebornIOException =>
+ logWarning("Handle request with legacy RPCs", exception)
+ return handleLegacyRpcMessage(client, rpcRequest, callback)
+ }
+ message match {
+ case openStream: PbOpenStream =>
+ handleOpenStreamInternal(
+ client,
+ openStream.getShuffleKey,
+ openStream.getFileName,
+ openStream.getStartIndex,
+ openStream.getEndIndex,
+ openStream.getInitialCredit,
+ rpcRequest.requestId,
+ isLegacy = false,
+ openStream.getReadLocalShuffle,
+ callback)
+ case bufferStreamEnd: PbBufferStreamEnd =>
+ handleEndStreamFromClient(bufferStreamEnd.getStreamId,
bufferStreamEnd.getStreamType)
+ case readAddCredit: PbReadAddCredit =>
+ handleReadAddCredit(readAddCredit.getCredit, readAddCredit.getStreamId)
+ case chunkFetchRequest: PbChunkFetchRequest =>
+ handleChunkFetchRequest(
+ client,
+ StreamChunkSlice.fromProto(chunkFetchRequest.getStreamChunkSlice),
+ rpcRequest)
+ case message: GeneratedMessageV3 =>
+ logError(s"Unknown message $message")
Review Comment:
This is also unrelated to this change, so I am not going to change it.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
