Merge branch '2.x' of https://github.com/seata/seata into dev-registe…

…r-fail-reason

changes/en-us/2.x.md

@@ -24,7 +24,11 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6947](https://github.com/apache/incubator-seata/pull/6947)] fix npe for nacos registry when look up address
 - [[#6984](https://github.com/apache/incubator-seata/pull/6984)] support building docker image on openjdk23
 - [[#6994](https://github.com/apache/incubator-seata/pull/6994)] fix the problem of building undoLog exception when update join does not update data
-
+- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] fix the Raft NPE issue caused by two-phase concurrency
+- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] fix error while the "context" is key word in DM8 when delete undolog
+- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] fix `store.mode` property in `application.raft.example.yml`
+- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] fix vGroupMappingManager is NOT init
+- 
 ### optimize:
 - [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA read-only transaction
 - [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
@@ -46,13 +50,15 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC serialization default to Protobuf
 - [[#6993](https://github.com/apache/incubator-seata/pull/6993)] optimize transaction metrics
 - [[#6995](https://github.com/apache/incubator-seata/pull/6995)] upgrade outdate npmjs dependencies
-
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] optimize lock release logic in AT transaction mode
+- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] optimize fail fast, when all server not available
 
 ### refactor:
 
 
 ### test:
 - [[#6927](https://github.com/apache/incubator-seata/pull/6927)] Add unit tests for the `seata-rocketmq` module
+- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] Add unit tests for the `seata-tm` module
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 
@@ -71,6 +77,9 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [xingfudeshi](https://github.com/xingfudeshi)
 - [o-jimin](https://github.com/o-jimin)
 - [lixingjia77](https://github.com/lixingjia77)
+- [whaon](https://github.com/whaon)
+- [YvCeung](https://github.com/YvCeung)
+- [jsbxyyx](https://github.com/jsbxyyx)
 
 
 

changes/zh-cn/2.x.md

@@ -24,7 +24,10 @@
 - [[#6947](https://github.com/apache/incubator-seata/pull/6947)] 修复nacos注册中心查询可用地址时的空指针问题
 - [[#6984](https://github.com/apache/incubator-seata/pull/6984)] 修复 openjdk23 版本下无法构建 docker 镜像的问题
 - [[#6994](https://github.com/apache/incubator-seata/pull/6994)] 修复updateJoin语句未更新到数据时prepareUndoLog异常
-
+- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] 修复Raft模式下两阶段并发可能导致NPE的问题
+- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] 修复使用达梦数据库时删除undolog发生SQL语法错误
+- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] 修复 `application.raft.example.yml`的 `store.mode`属性
+- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] 修复vGroupMappingManager未初始化的问题
 
 ### optimize:
 - [[#6826](https://github.com/apache/incubator-seata/pull/6826)] 移除只读XA事务的分支注册操作
@@ -47,7 +50,11 @@
 - [[#6950](https://github.com/apache/incubator-seata/pull/6950)] 移除JVM参数app.id
 - [[#6959](https://github.com/apache/incubator-seata/pull/6959)] 修正 `seata-http-jakarta`的模块命名和描述
 - [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC协议序列化默认值为protobuf
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] 优化 AT 事务模式锁释放逻辑
 - [[#6993](https://github.com/apache/incubator-seata/pull/6993)] 优化 metrics 指标
+- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] 升级过时的 npmjs 依赖
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] 优化 AT 事务模式锁释放逻辑
+- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] 优化快速失败
 
 ### refactor:
 
@@ -56,6 +63,8 @@
 
 ### test:
 - [[#6927](https://github.com/apache/incubator-seata/pull/6927)] 增加`seata-rocketmq`模块的测试用例
+- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] 增加 `seata-tm` 模块的测试用例
+
 
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
 
@@ -74,6 +83,9 @@
 - [xingfudeshi](https://github.com/xingfudeshi)
 - [o-jimin](https://github.com/o-jimin)
 - [lixingjia77](https://github.com/lixingjia77)
+- [whaon](https://github.com/whaon)
+- [YvCeung](https://github.com/YvCeung)
+- [jsbxyyx](https://github.com/jsbxyyx)
 
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

common/src/main/java/org/apache/seata/common/ConfigurationKeys.java

@@ -504,9 +504,15 @@ public interface ConfigurationKeys {
 
     /**
      * The constant ROLLBACK_RETRY_TIMEOUT_UNLOCK_ENABLE.
+     * This configuration is deprecated, please use {@link #ROLLBACK_FAILED_UNLOCK_ENABLE} instead.
      */
+    @Deprecated
     String ROLLBACK_RETRY_TIMEOUT_UNLOCK_ENABLE = SERVER_PREFIX + "rollbackRetryTimeoutUnlockEnable";
 
+    /**
+     * The constant ROLLBACK_FAILED_UNLOCK_ENABLE.
+     */
+    String ROLLBACK_FAILED_UNLOCK_ENABLE = SERVER_PREFIX + "rollbackFailedUnlockEnable";
     /**
      * the constant RETRY_DEAD_THRESHOLD
      */