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

apache · Mar 17, 2022 · ac12355 · ac12355
1 parent 61cac63
commit ac12355
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/changes/1.5.0.md b/changes/1.5.0.md
@@ -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分支下，运行时切换事务分组对应集群引起的错误
   - [[#4474](https://github.com/seata/seata/pull/4474)] 修复Mysql多位Bit类型字段回滚错误
 
 

diff --git a/changes/en-us/1.5.0.md b/changes/en-us/1.5.0.md
@@ -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
   - [[#4474](https://github.com/seata/seata/pull/4474)] fix Mysql multi-bit Bit type field rollback error
 
 

diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java b/core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java
@@ -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;
@@ -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) {