Merge branch '2.x' into clever_tcc_fence_hook_function

README.md

@@ -5,7 +5,7 @@
 # Seata: Simple Extensible Autonomous Transaction Architecture
 
 [![Build Status](https://github.com/apache/incubator-seata/workflows/build/badge.svg?branch=develop)](https://github.com/apache/incubator-seata/actions)
-[![codecov](https://codecov.io/gh/apache/incubator-seata/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-seata)
+[![codecov](https://codecov.io/gh/apache/incubator-seata/graph/badge.svg?token=tbmHt2ZfxO)](https://codecov.io/gh/apache/incubator-seata)
 [![license](https://img.shields.io/github/license/apache/incubator-seata.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![maven](https://img.shields.io/maven-central/v/io.apache/incubator-seata-parent?versionSuffix=2.0.0)](https://search.maven.org/search?q=io.seata)
 

changes/en-us/2.x.md

@@ -26,6 +26,9 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6701](https://github.com/apache/incubator-seata/pull/6728)] fix support serialization for dm.jdbc.driver.DmdbTimestamp
 - [[#6757](https://github.com/apache/incubator-seata/pull/6757)] the bug where multiple nodes cannot be retrieved from the naming server
 - [[#6769](https://github.com/apache/incubator-seata/pull/6769)] fix tcc fence deadLock
+- [[#6778](https://github.com/apache/incubator-seata/pull/6778)] fix namingserver node term
+- [[#6765](https://github.com/apache/incubator-seata/pull/6765)] fix MySQL driver loading by replacing custom classloader with system classloader for better compatibility and simplified process
+- [[#6781](https://github.com/apache/incubator-seata/pull/6781)] the issue where the TC occasionally fails to go offline from the NamingServer
 
 
 ### optimize:
@@ -62,7 +65,10 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6763](https://github.com/apache/incubator-seata/pull/6763)] optimize NacosConfiguration singleton reload
 - [[#6761](https://github.com/apache/incubator-seata/pull/6761)] optimize the namingserver code to improve readability
 - [[#6768](https://github.com/apache/incubator-seata/pull/6768)] report the tcc fence transaction isolation level
-
+- [[#6770](https://github.com/apache/incubator-seata/pull/6770)] Automatic deletion of namingserver vgroup through Caffeine map
+- [[#6780](https://github.com/apache/incubator-seata/pull/6780)] optimize the reflection operation in class `SerializerServiceLoader`
+- [[#6784](https://github.com/apache/incubator-seata/pull/6784)] upgrade axios to 1.7.4
+- [[#6787](https://github.com/apache/incubator-seata/pull/6787)] upgrade elliptic to 6.5.7
 
 ### refactor:
 
@@ -75,6 +81,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6647](https://github.com/apache/incubator-seata/pull/6647)] improve the test case coverage of saga module to 70%
 - [[#6695](https://github.com/apache/incubator-seata/pull/6695)] old version(< 0.7.1) client test case for multi-version protocol
 - [[#6750](https://github.com/apache/incubator-seata/pull/6750)] increase spring autoconfigure module unit test converage
+- [[#6773](https://github.com/apache/incubator-seata/pull/6773)] fix the wrong code coverage from codecov icon in default branch
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 

changes/zh-cn/2.x.md

@@ -27,6 +27,10 @@
 - [[#6701](https://github.com/apache/incubator-seata/pull/6728)] 修复达梦数据库的对dm.jdbc.driver.DmdbTimestamp的支持
 - [[#6757](https://github.com/apache/incubator-seata/pull/6757)] 修复client通过namingserver只能获取到一个tc节点的bug
 - [[#6769](https://github.com/apache/incubator-seata/pull/6769)] 修复tcc fence死锁
+- [[#6778](https://github.com/apache/incubator-seata/pull/6778)] 修复namingserver的节点term为0问题
+- [[#6765](https://github.com/apache/incubator-seata/pull/6765)] 改进MySQL驱动加载机制，将自定义类加载器替换为系统类加载器，更兼容简化流程
+- [[#6781](https://github.com/apache/incubator-seata/pull/6781)] 修复tc下线时,由于定时任务没有先关闭,导致下线后还会被注册上,需要靠namingserver的健康检查来下线的bug
+
 
 ### optimize:
 - [[#6499](https://github.com/apache/incubator-seata/pull/6499)] 拆分 committing 和 rollbacking 状态的任务线程池
@@ -62,6 +66,10 @@
 - [[#6763](https://github.com/apache/incubator-seata/pull/6763)] 优化 NacosConfiguration 单例加载
 - [[#6761](https://github.com/apache/incubator-seata/pull/6761)] 提升namingserver manager代码可读性
 - [[#6768](https://github.com/apache/incubator-seata/pull/6768)] 上报tcc fence事务隔离级别
+- [[#6770](https://github.com/apache/incubator-seata/pull/6770)] 通过caffeine map支持namingserver事务分组的过期删除
+- [[#6780](https://github.com/apache/incubator-seata/pull/6780)] 优化类 `SerializerServiceLoader` 中的反射操作
+- [[#6784](https://github.com/apache/incubator-seata/pull/6784)] 升级 axios 至 1.7.4 版本
+- [[#6787](https://github.com/apache/incubator-seata/pull/6787)] 升级 elliptic 至 6.5.7 版本
 
 
 ### refactor:
@@ -76,7 +84,7 @@
 - [[#6647](https://github.com/apache/incubator-seata/pull/6647)] 增加saga模块的测试用例覆盖率
 - [[#6695](https://github.com/apache/incubator-seata/pull/6695)] 多版本协议的旧版本（< 0.7.1）客户端测试用例
 - [[#6750](https://github.com/apache/incubator-seata/pull/6750)] 提升spring autoconfigure模块单测覆盖率
-
+- [[#6773](https://github.com/apache/incubator-seata/pull/6773)] 修复codecov图标显示错误的代码覆盖率
 
 
 

common/src/main/java/org/apache/seata/common/metadata/namingserver/NamingServerNode.java

@@ -27,6 +27,15 @@ public class NamingServerNode extends Node {
     private double weight = 1.0;
     private boolean healthy = true;
     private long term;
+    private String unit;
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
 
     public double getWeight() {
         return weight;

common/src/main/java/org/apache/seata/common/util/ReflectionUtil.java

@@ -89,6 +89,21 @@ public static Class<?> getClassByName(String className) throws ClassNotFoundExce
         return Class.forName(className, true, Thread.currentThread().getContextClassLoader());
     }
 
+    /**
+     * Is class present boolean.
+     *
+     * @param className the class name
+     * @return boolean true if the class is present
+     */
+    public static boolean isClassPresent(String className) {
+        try {
+            Class.forName(className, false, Thread.currentThread().getContextClassLoader());
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
     /**
      * Get the wrapped class
      *

common/src/test/java/org/apache/seata/common/util/ReflectionUtilTest.java

@@ -45,6 +45,12 @@ public void testGetClassByName() throws ClassNotFoundException {
                 ReflectionUtil.getClassByName("java.lang.String"));
     }
 
+    @Test
+    public void testIsClassPresent() {
+        Assertions.assertTrue(ReflectionUtil.isClassPresent("java.lang.String"));
+        Assertions.assertFalse(ReflectionUtil.isClassPresent("java.lang.String2"));
+    }
+
     @Test
     public void testGetWrappedClass() {
         Assertions.assertEquals(Byte.class, ReflectionUtil.getWrappedClass(byte.class));