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.

Sign up for GitHub

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

Jump to bottom

bugfix: fix the error when service.vgroupMapping change #4471

Merged
merged 5 commits into from Mar 17, 2022
Merged

bugfix: fix the error when service.vgroupMapping change #4471

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16510be
bugfix: fix the error when service.vgroupMapping change
pengten Mar 15, 2022
fa03816
Update NettyClientChannelManager.java
pengten Mar 15, 2022
4da73c7
bugfix: fix the error when service.vgroupMapping change
pengten Mar 15, 2022
6a801a5
Merge branch 'bugfix_vgroupmapping_change' of https://github.com/peng…
pengten Mar 15, 2022
56313d4
Merge branch 'develop' into bugfix_vgroupmapping_change
slievrly Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/1.5.0.md
View file
Open in desktop
Expand Up @@ -104,6 +104,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
- [[#4438](https://github.com/seata/seata/pull/4438)] 修复develop版本file模式下GlobalSession在延迟删除的情况下无法被正常删除的问题
- [[#4432](https://github.com/seata/seata/pull/4432)] 修复develop版本下ServerApplicationListener无法读取配置中心配置的问题
- [[#4452](https://github.com/seata/seata/pull/4452)] 修复'service.disableGlobalTransaction'配置的日志输出错误
- [[#4471](https://github.com/seata/seata/pull/4471)] 修复develop分支下，运行时切换事务分组对应集群引起的错误


### optimize：
Expand Down
1 change: 1 addition & 0 deletions changes/en-us/1.5.0.md
View file
Open in desktop
Expand Up @@ -106,6 +106,7 @@
- [[#4438](https://github.com/seata/seata/pull/4438)] fix the problem that GlobalSession could not be deleted normally in the case of delayed deletion in the file mode of the develop branch
- [[#4432](https://github.com/seata/seata/pull/4432)] fix the inability to get some remote configurations
- [[#4452](https://github.com/seata/seata/pull/4452)] fix the change log of 'service.disableGlobalTransaction' config
- [[#4471](https://github.com/seata/seata/pull/4471)] in branch 'develop', fix the error when service.vgroupMapping change



Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
Expand Down Expand Up @@ -187,17 +188,18 @@ void reconnect(String transactionServiceGroup) {
}
return;
}
Set<String> channelAddress = new HashSet<>(availList.size());
try {
for (String serverAddress : availList) {
try {
acquireChannel(serverAddress);
channelAddress.add(serverAddress);
} catch (Exception e) {
LOGGER.error("{} can not connect to {} cause:{}", FrameworkErrorCode.NetConnect.getErrCode(),
serverAddress, e.getMessage(), e);
}
}
} finally {
Set<String> channelAddress = channels.keySet();
if (CollectionUtils.isNotEmpty(channelAddress)) {
List<InetSocketAddress> aliveAddress = new ArrayList<>(channelAddress.size());
for (String address : channelAddress) {
Expand Down