Merge branch '2.x' into feature/saga-com

apache · Apr 8, 2024 · d194927 · d194927
2 parents a7563b9 + 77bcaa2
commit d194927
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -34,6 +34,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6372](https://github.com/apache/incubator-seata/pull/6372)] fix initializing the sql file postgresql.sql index name conflict
 - [[#6380](https://github.com/apache/incubator-seata/pull/6380)] fix sql exception when checking for the existence of the UNDO_LOG table on SQL server
 - [[#6385](https://github.com/apache/incubator-seata/pull/6385)] fix the bug where Role.participant does not execute hooks but clears them.
+- [[#6465](https://github.com/apache/incubator-seata/pull/6465)] fix(6257): fix saga mode replay context lost start in 2.x
 
 ### optimize:
 - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] add a check for the existence of the undolog table
@@ -112,6 +113,11 @@ Add changes here for all PR submitted to the 2.x branch.
   retry mechanism
 - [[#6387](https://github.com/apache/incubator-seata/pull/6387)] optimize tcc use compatible
 - [[#6402](https://github.com/apache/incubator-seata/pull/6402)] optimize rm-datasource use compatible
+- [[#6419](https://github.com/apache/incubator-seata/pull/6419)] optimize integration-tx-api compatibl
+- [[#6442](https://github.com/apache/incubator-seata/pull/6442)] clarify if conditions
+
+### refactor:
+- [[#6269](https://github.com/apache/incubator-seata/pull/6269)] standardize Seata Exception
 - [[#6419](https://github.com/apache/incubator-seata/pull/6419)] optimize integration-tx-api compatible
 - [[#6427](https://github.com/apache/incubator-seata/pull/6427)] support spi、saga、spring module compatible
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -34,7 +34,7 @@
 - [[#6372](https://github.com/apache/incubator-seata/pull/6372)] 修复初始化sql文件postgresql.sql 索引名称冲突问题
 - [[#6380](https://github.com/apache/incubator-seata/pull/6380)] 修复针对sql server检查UNDO_LOG表是否存在时的SQL异常
 - [[#6385](https://github.com/apache/incubator-seata/pull/6385)] 修复Role.Participant不执行hook但会清理的问题
-
+- [[#6465](https://github.com/apache/incubator-seata/pull/6465)] 修复2.0下saga模式的context replay丢失start问题
 
 
 ### optimize:
@@ -116,6 +116,7 @@
 - [[#6402](https://github.com/apache/incubator-seata/pull/6402)] 优化rm-datasource向下兼容
 - [[#6419](https://github.com/apache/incubator-seata/pull/6419)] 优化integration-tx-api向下兼容
 - [[#6427](https://github.com/apache/incubator-seata/pull/6427)] 支持spi、saga、spring模块的向下兼容
+- [[#6442](https://github.com/apache/incubator-seata/pull/6442)] 阐明 if
 
 
 ### refactor:

diff --git a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java
@@ -264,9 +264,10 @@ public void undo(DataSourceProxy dataSourceProxy, String xid, long branchId) thr
             try {
                 connectionProxy = dataSourceProxy.getConnection();
                 conn = connectionProxy.getTargetConnection();
+                originalAutoCommit = conn.getAutoCommit();
 
                 // The entire undo process should run in a local transaction.
-                if (originalAutoCommit = conn.getAutoCommit()) {
+                if (originalAutoCommit) {
                     conn.setAutoCommit(false);
                 }
 

diff --git a/...engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java b/...engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
@@ -358,7 +358,7 @@ private Map<String, Object> getStateMachineContextVariables(StateMachineInstance
 
     protected Map<String, Object> replayContextVariables(StateMachineInstance stateMachineInstance) {
         Map<String, Object> contextVariables = new HashMap<>();
-        if (stateMachineInstance.getStartParams() == null) {
+        if (stateMachineInstance.getStartParams() != null) {
             contextVariables.putAll(stateMachineInstance.getStartParams());
         }
 

diff --git a/server/src/main/java/org/apache/seata/server/session/SessionHolder.java b/server/src/main/java/org/apache/seata/server/session/SessionHolder.java
@@ -361,7 +361,8 @@ public static boolean releaseDistributedLock(String lockKey) {
     public static boolean distributedLockAndExecute(String key, NoArgsFunc func) {
         boolean lock = false;
         try {
-            if (lock = acquireDistributedLock(key)) {
+            lock = acquireDistributedLock(key);
+            if (lock) {
                 func.call();
             }
         } catch (Exception e) {

diff --git a/server/src/main/java/org/apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java b/server/src/main/java/org/apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java
@@ -116,7 +116,8 @@ public boolean acquireLock(List<LockDO> lockDOs, boolean autoCommit, boolean ski
         }
         try {
             conn = lockStoreDataSource.getConnection();
-            if (originalAutoCommit = conn.getAutoCommit()) {
+            originalAutoCommit = conn.getAutoCommit();
+            if (originalAutoCommit) {
                 conn.setAutoCommit(false);
             }
             List<LockDO> unrepeatedLockDOs = lockDOs;

diff --git a/server/src/main/java/org/apache/seata/server/storage/redis/lock/RedisDistributedLocker.java b/server/src/main/java/org/apache/seata/server/storage/redis/lock/RedisDistributedLocker.java
@@ -45,7 +45,7 @@ public class RedisDistributedLocker implements DistributedLocker {
     @Override
     public boolean acquireLock(DistributedLockDO distributedLockDO) {
         try (Jedis jedis = JedisPooledFactory.getJedisInstance()) {
-            //Don't need retry,if can't acquire the lock,let the other get the lock
+            //Don't need to retry, if you can't acquire the lock,let the other get the lock
             String result = jedis.set(distributedLockDO.getLockKey(), distributedLockDO.getLockValue(), SetParams.setParams().nx().px(distributedLockDO.getExpireTime()));
             return SUCCESS.equalsIgnoreCase(result);
         } catch (Exception ex) {