-
Notifications
You must be signed in to change notification settings - Fork 8.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
optimize: support fast fail when channel disconnect after message sent for RemotingClient #7095
base: 2.x
Are you sure you want to change the base?
Changes from all commits
9cf841e
01d776d
89a1ceb
386651a
c3c81fa
f738f3e
4ba1621
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,6 +20,7 @@ | |
import java.net.InetSocketAddress; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.Set; | ||
import java.util.concurrent.BlockingQueue; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
import java.util.concurrent.ExecutorService; | ||
|
@@ -91,6 +92,9 @@ public abstract class AbstractNettyRemotingClient extends AbstractNettyRemoting | |
|
||
protected final Map<Integer, Integer> childToParentMap = new ConcurrentHashMap<>(); | ||
|
||
// Channel -> Set<msgId> | ||
protected final ConcurrentHashMap<Channel, Set<Integer>> channelToRequestIds = new ConcurrentHashMap<>(); | ||
|
||
/** | ||
* When batch sending is enabled, the message will be stored to basketMap | ||
* Send via asynchronous thread {@link AbstractNettyRemotingClient.MergedSendRunnable} | ||
|
@@ -181,6 +185,7 @@ public Object sendSyncRequest(Object msg) throws TimeoutException { | |
} | ||
} else { | ||
Channel channel = clientChannelManager.acquireChannel(serverAddress); | ||
channelToRequestIds.computeIfAbsent(channel, ch -> ConcurrentHashMap.newKeySet()).add(rpcMessage.getId()); | ||
return super.sendSync(channel, rpcMessage, timeoutMillis); | ||
} | ||
|
||
|
@@ -193,6 +198,7 @@ public Object sendSyncRequest(Channel channel, Object msg) throws TimeoutExcepti | |
return null; | ||
} | ||
RpcMessage rpcMessage = buildRequestMessage(msg, ProtocolConstants.MSGTYPE_RESQUEST_SYNC); | ||
channelToRequestIds.computeIfAbsent(channel, ch -> ConcurrentHashMap.newKeySet()).add(rpcMessage.getId()); | ||
return super.sendSync(channel, rpcMessage, this.getRpcRequestTimeout()); | ||
} | ||
|
||
|
@@ -214,6 +220,7 @@ public void sendAsyncRequest(Channel channel, Object msg) { | |
childToParentMap.put(msgId, parentId); | ||
} | ||
} | ||
channelToRequestIds.computeIfAbsent(channel, ch -> ConcurrentHashMap.newKeySet()).add(rpcMessage.getId()); | ||
} | ||
super.sendAsync(channel, rpcMessage); | ||
} | ||
|
@@ -222,6 +229,7 @@ public void sendAsyncRequest(Channel channel, Object msg) { | |
public void sendAsyncResponse(String serverAddress, RpcMessage rpcMessage, Object msg) { | ||
RpcMessage rpcMsg = buildResponseMessage(rpcMessage, msg, ProtocolConstants.MSGTYPE_RESPONSE); | ||
Channel channel = clientChannelManager.acquireChannel(serverAddress); | ||
channelToRequestIds.computeIfAbsent(channel, ch -> ConcurrentHashMap.newKeySet()).add(rpcMessage.getId()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is fast-failure necessary for AsyncSend? Is there Future waiting in this case? |
||
super.sendAsync(channel, rpcMsg); | ||
} | ||
|
||
|
@@ -423,7 +431,9 @@ class ClientHandler extends ChannelDuplexHandler { | |
@Override | ||
public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception { | ||
if (msg instanceof RpcMessage) { | ||
processMessage(ctx, (RpcMessage)msg); | ||
RpcMessage rpcMessage = (RpcMessage)msg; | ||
processMessage(ctx, rpcMessage); | ||
removeRequestIdFromChannel(ctx.channel(), rpcMessage.getId()); | ||
} else { | ||
LOGGER.error("rpcMessage type error"); | ||
} | ||
|
@@ -448,6 +458,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { | |
LOGGER.info("channel inactive: {}", ctx.channel()); | ||
} | ||
clientChannelManager.releaseChannel(ctx.channel(), NetUtil.toStringAddress(ctx.channel().remoteAddress())); | ||
failFuturesForChannel(ctx.channel(), new FrameworkException(FrameworkErrorCode.ChannelIsNotWritable)); | ||
super.channelInactive(ctx); | ||
} | ||
|
||
|
@@ -489,6 +500,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E | |
if (LOGGER.isInfoEnabled()) { | ||
LOGGER.info("remove exception rm channel:{}", ctx.channel()); | ||
} | ||
failFuturesForChannel(ctx.channel(), cause); | ||
super.exceptionCaught(ctx, cause); | ||
} | ||
|
||
|
@@ -501,4 +513,59 @@ public void close(ChannelHandlerContext ctx, ChannelPromise future) throws Excep | |
} | ||
} | ||
|
||
/** | ||
* Iterates over futures and marks all MessageFutures associated with the specified Channel as failed. | ||
* | ||
* @param channel The Channel that has been disconnected or encountered an exception. | ||
* @param cause The reason for the failure. | ||
*/ | ||
private void failFuturesForChannel(Channel channel, Throwable cause) { | ||
Set<Integer> requestIds = channelToRequestIds.remove(channel); | ||
if (requestIds != null) { | ||
for (Integer requestId : requestIds) { | ||
MessageFuture future = futures.remove(requestId); | ||
if (future != null) { | ||
future.setResultMessage(cause); | ||
} | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Removes the association between the specified Channel and requestId from the channelToRequestIds mapping. | ||
* If the Channel no longer has any associated requestId, the Channel will be removed from the mapping. | ||
* | ||
* @param channel The Channel that has been disconnected or encountered an exception. | ||
* @param requestId The requestId to be removed. | ||
*/ | ||
private void removeRequestIdFromChannel(Channel channel, Integer requestId) { | ||
if (channel == null) { | ||
if (requestId != null) { | ||
LOGGER.warn("Attempted to remove requestId {} from a null channel.", requestId); | ||
} else { | ||
LOGGER.warn("Attempted to remove a null requestId from a null channel."); | ||
} | ||
return; | ||
} | ||
|
||
if (requestId == null) { | ||
LOGGER.warn("Attempted to remove a null requestId from channel {}.", channel); | ||
return; | ||
} | ||
|
||
channelToRequestIds.computeIfPresent(channel, (ch, requestIds) -> { | ||
boolean removed = requestIds.remove(requestId); | ||
if (removed) { | ||
LOGGER.debug("Removed requestId {} from channel {}.", requestId, ch); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You need to determine whether the current log level is debug level or not. |
||
} else { | ||
LOGGER.warn("Attempted to remove non-existing requestId {} from channel {}.", requestId, ch); | ||
} | ||
|
||
if (requestIds.isEmpty()) { | ||
LOGGER.debug("No more requestIds associated with channel {}. Channel removed from mapping.", ch); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You need to determine whether the current log level is debug level or not. |
||
return null; | ||
} | ||
return requestIds; | ||
}); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the computeIfAbsent operation be extracted method? and integrated with super.sendSync? Avoid code duplication and missing calls