Skip to content
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

Open
wants to merge 9 commits into
base: 2.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7142](https://github.com/apache/incubator-seata/pull/7142)] upgrade commons-compress to 1.27.1
- [[#7149](https://github.com/apache/incubator-seata/pull/7149)] Fix abnormal character display issues in ./distribution/NOTICE.md
- [[#7170](https://github.com/apache/incubator-seata/pull/7170)] Optimize seata client I/O processing by adjusting thread count

- [[#7095](https://github.com/apache/incubator-seata/pull/7095)] support fast fail when channel disconnect after message sent for RemotingClient

### security:
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities
Expand Down
2 changes: 1 addition & 1 deletion changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
- [[#7142](https://github.com/apache/incubator-seata/pull/7142)] 升级 commons-compress 至 1.27.1 版本
- [[#7149](https://github.com/apache/incubator-seata/pull/7149)] 修复./distribution/NOTICE.md文件中的异常字符串显示问题
- [[#7170](https://github.com/apache/incubator-seata/pull/7170)] 通过调整线程数优化 Seata 客户端 I/O 处理

- [[#7095](https://github.com/apache/incubator-seata/pull/7095)] 当消息发送后通道中断,快速失败,以便于减少不必要的等待

### security:
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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);
}

Expand All @@ -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());
}

Expand All @@ -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);
}
Expand Down Expand Up @@ -423,7 +430,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");
}
Expand All @@ -448,6 +457,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);
}

Expand Down Expand Up @@ -489,6 +499,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);
}

Expand All @@ -501,4 +512,71 @@ 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) {
if (LOGGER.isWarnEnabled()) {
LOGGER.warn("Attempted to remove requestId {} from a null channel.", requestId);
}
} else {
if (LOGGER.isWarnEnabled()) {
LOGGER.warn("Attempted to remove a null requestId from a null channel.");
}
}
return;
}

if (requestId == null) {
if (LOGGER.isWarnEnabled()) {
LOGGER.warn("Attempted to remove a null requestId from channel {}.", channel);
}
return;
}

channelToRequestIds.computeIfPresent(channel, (ch, requestIds) -> {
boolean removed = requestIds.remove(requestId);
if (removed) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Removed requestId {} from channel {}.", requestId, ch);
}
} else {
if (LOGGER.isWarnEnabled()) {
LOGGER.warn("Attempted to remove non-existing requestId {} from channel {}.", requestId, ch);
}
}

if (requestIds.isEmpty()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("No more requestIds associated with channel {}. Channel removed from mapping.", ch);
}
return null;
}
return requestIds;
});
}
}
Loading