diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md index d49b79423ac..b5455c99010 100644 --- a/changes/en-us/develop.md +++ b/changes/en-us/develop.md @@ -6,6 +6,7 @@ Add changes here for all PR submitted to the develop branch. - [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] A brief and accurate description of PR ### bugfix: +- [[#5887](https://github.com/seata/seata/pull/5887)] fix global transaction hook repeat execute - [[#5991](https://github.com/seata/seata/pull/5991)] fix the issue that the Lua script is not synchronized when the redis sentinel master node is down ### optimize: @@ -21,6 +22,7 @@ Thanks to these contributors for their code commits. Please report an unintended - [slievrly](https://github.com/slievrly) -- [GitHub_ID](https://github.com/GitHub_ID) +- [jsbxyyx](https://github.com/jsbxyyx) + Also, we receive many valuable issues, questions and advices from our community. Thanks for you all. diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md index 7f2e900fd0f..d9bfd9e3e7d 100644 --- a/changes/zh-cn/develop.md +++ b/changes/zh-cn/develop.md @@ -6,6 +6,7 @@ - [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 准确简要的PR描述 ### bugfix: +- [[#5887](https://github.com/seata/seata/pull/5887)] 修复全局事务钩子重复执行 - [[#5991](https://github.com/seata/seata/pull/5991)] 修复redis sentinel master node 宕机时，lua脚本未同步的问题 ### optimize: @@ -21,7 +22,6 @@ - [slievrly](https://github.com/slievrly) -- [GitHub_ID](https://github.com/GitHub_ID) - +- [jsbxyyx](https://github.com/jsbxyyx) 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。 diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java index 353b1e96fbb..a920f255310 100644 --- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java +++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java @@ -197,10 +197,10 @@ public void recordStateMachineFinished(StateMachineInstance machineInstance, Pro protected void reportTransactionFinished(StateMachineInstance machineInstance, ProcessContext context) { if (sagaTransactionalTemplate != null) { + GlobalTransaction globalTransaction = null; try { - GlobalTransaction globalTransaction = getGlobalTransaction(machineInstance, context); + globalTransaction = getGlobalTransaction(machineInstance, context); if (globalTransaction == null) { - throw new EngineExecutionException("Global transaction is not exists", FrameworkErrorCode.ObjectNotExists); } @@ -234,7 +234,7 @@ protected void reportTransactionFinished(StateMachineInstance machineInstance, P // clear RootContext.unbind(); RootContext.unbindBranchType(); - sagaTransactionalTemplate.triggerAfterCompletion(); + sagaTransactionalTemplate.triggerAfterCompletion(globalTransaction); sagaTransactionalTemplate.cleanUp(); } } diff --git a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java index be79e920f0b..04b82afa2fb 100644 --- a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java +++ b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java @@ -30,6 +30,7 @@ import io.seata.tm.TMClient; import io.seata.tm.api.GlobalTransaction; import io.seata.tm.api.GlobalTransactionContext; +import io.seata.tm.api.GlobalTransactionRole; import io.seata.tm.api.TransactionalExecutor; import io.seata.tm.api.TransactionalExecutor.ExecutionException; import io.seata.tm.api.transaction.TransactionHook; @@ -63,9 +64,9 @@ public class DefaultSagaTransactionalTemplate @Override public void commitTransaction(GlobalTransaction tx) throws TransactionalExecutor.ExecutionException { try { - triggerBeforeCommit(); + triggerBeforeCommit(tx); tx.commit(); - triggerAfterCommit(); + triggerAfterCommit(tx); } catch (TransactionException txe) { // 4.1 Failed to commit throw new TransactionalExecutor.ExecutionException(tx, txe, TransactionalExecutor.Code.CommitFailure); @@ -75,9 +76,9 @@ public void commitTransaction(GlobalTransaction tx) throws TransactionalExecutor @Override public void rollbackTransaction(GlobalTransaction tx, Throwable ex) throws TransactionException, TransactionalExecutor.ExecutionException { - triggerBeforeRollback(); + triggerBeforeRollback(tx); tx.rollback(); - triggerAfterRollback(); + triggerAfterRollback(tx); // Successfully rolled back } @@ -85,9 +86,9 @@ public void rollbackTransaction(GlobalTransaction tx, Throwable ex) public GlobalTransaction beginTransaction(TransactionInfo txInfo) throws TransactionalExecutor.ExecutionException { GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate(); try { - triggerBeforeBegin(); + triggerBeforeBegin(tx); tx.begin(txInfo.getTimeOut(), txInfo.getName()); - triggerAfterBegin(); + triggerAfterBegin(tx); } catch (TransactionException txe) { throw new TransactionalExecutor.ExecutionException(tx, txe, TransactionalExecutor.Code.BeginFailure); @@ -105,7 +106,7 @@ public void reportTransaction(GlobalTransaction tx, GlobalStatus globalStatus) throws TransactionalExecutor.ExecutionException { try { tx.globalReport(globalStatus); - triggerAfterCompletion(); + triggerAfterCompletion(tx); } catch (TransactionException txe) { throw new TransactionalExecutor.ExecutionException(tx, txe, TransactionalExecutor.Code.ReportFailure); @@ -125,73 +126,87 @@ public void branchReport(String xid, long branchId, BranchStatus status, String DefaultResourceManager.get().branchReport(BranchType.SAGA, xid, branchId, status, applicationData); } - protected void triggerBeforeBegin() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.beforeBegin(); - } catch (Exception e) { - LOGGER.error("Failed execute beforeBegin in hook {}", e.getMessage(), e); + protected void triggerBeforeBegin(GlobalTransaction tx) { + if (tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.beforeBegin(); + } catch (Exception e) { + LOGGER.error("Failed execute beforeBegin in hook {}", e.getMessage(), e); + } } } } - protected void triggerAfterBegin() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.afterBegin(); - } catch (Exception e) { - LOGGER.error("Failed execute afterBegin in hook {} ", e.getMessage(), e); + protected void triggerAfterBegin(GlobalTransaction tx) { + if (tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.afterBegin(); + } catch (Exception e) { + LOGGER.error("Failed execute afterBegin in hook {} ", e.getMessage(), e); + } } } } - protected void triggerBeforeRollback() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.beforeRollback(); - } catch (Exception e) { - LOGGER.error("Failed execute beforeRollback in hook {} ", e.getMessage(), e); + protected void triggerBeforeRollback(GlobalTransaction tx) { + if (tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.beforeRollback(); + } catch (Exception e) { + LOGGER.error("Failed execute beforeRollback in hook {} ", e.getMessage(), e); + } } } } - protected void triggerAfterRollback() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.afterRollback(); - } catch (Exception e) { - LOGGER.error("Failed execute afterRollback in hook {}", e.getMessage(), e); + protected void triggerAfterRollback(GlobalTransaction tx) { + if (tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.afterRollback(); + } catch (Exception e) { + LOGGER.error("Failed execute afterRollback in hook {}", e.getMessage(), e); + } } } } - protected void triggerBeforeCommit() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.beforeCommit(); - } catch (Exception e) { - LOGGER.error("Failed execute beforeCommit in hook {}", e.getMessage(), e); + protected void triggerBeforeCommit(GlobalTransaction tx) { + if (tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.beforeCommit(); + } catch (Exception e) { + LOGGER.error("Failed execute beforeCommit in hook {}", e.getMessage(), e); + } } } } - protected void triggerAfterCommit() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.afterCommit(); - } catch (Exception e) { - LOGGER.error("Failed execute afterCommit in hook {}", e.getMessage(), e); + protected void triggerAfterCommit(GlobalTransaction tx) { + if (tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.afterCommit(); + } catch (Exception e) { + LOGGER.error("Failed execute afterCommit in hook {}", e.getMessage(), e); + } } } } @Override - public void triggerAfterCompletion() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.afterCompletion(); - } catch (Exception e) { - LOGGER.error("Failed execute afterCompletion in hook {}", e.getMessage(), e); + public void triggerAfterCompletion(GlobalTransaction tx) { + if (tx == null || tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.afterCompletion(); + } catch (Exception e) { + LOGGER.error("Failed execute afterCompletion in hook {}", e.getMessage(), e); + } } } } diff --git a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java index 04338592d03..3e1ff2c1fc7 100644 --- a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java +++ b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java @@ -48,7 +48,7 @@ long branchRegister(String resourceId, String clientId, String xid, String appli void branchReport(String xid, long branchId, BranchStatus status, String applicationData) throws TransactionException; - void triggerAfterCompletion(); + void triggerAfterCompletion(GlobalTransaction tx); void cleanUp(); } \ No newline at end of file diff --git a/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java b/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java index 7a4a9866575..50dd2b86370 100644 --- a/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java +++ b/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java @@ -73,7 +73,7 @@ public void branchReport(String xid, long branchId, BranchStatus status, String } @Override - public void triggerAfterCompletion() { + public void triggerAfterCompletion(GlobalTransaction tx) { } diff --git a/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java b/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java index 01998a4400b..6ffbe7a00a0 100644 --- a/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java +++ b/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java @@ -139,7 +139,7 @@ public Object execute(TransactionalExecutor business) throws Throwable { } finally { //5. clear resumeGlobalLockConfig(previousConfig); - triggerAfterCompletion(); + triggerAfterCompletion(tx); cleanUp(); } } finally { @@ -200,6 +200,12 @@ private void completeTransactionAfterThrowing(TransactionInfo txInfo, GlobalTran private void commitTransaction(GlobalTransaction tx, TransactionInfo txInfo) throws TransactionalExecutor.ExecutionException, TransactionException { + if (tx.getGlobalTransactionRole() != GlobalTransactionRole.Launcher) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Ignore commit: just involved in global transaction [{}]", tx.getXid()); + } + return; + } if (isTimeout(tx.getCreateTime(), txInfo)) { // business execution timeout Exception exx = new TmTransactionException(TransactionExceptionCode.TransactionTimeout, @@ -236,7 +242,7 @@ private void commitTransaction(GlobalTransaction tx, TransactionInfo txInfo) if (null != statusException) { throw new TransactionalExecutor.ExecutionException(tx, statusException, code); } - triggerAfterCommit(); + triggerAfterCommit(tx); } catch (TransactionException txe) { // 4.1 Failed to commit throw new TransactionalExecutor.ExecutionException(tx, txe, @@ -245,7 +251,12 @@ private void commitTransaction(GlobalTransaction tx, TransactionInfo txInfo) } private void rollbackTransaction(GlobalTransaction tx, Throwable originalException) throws TransactionException, TransactionalExecutor.ExecutionException { - + if (tx.getGlobalTransactionRole() != GlobalTransactionRole.Launcher) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Ignore rollback: just involved in global transaction [{}]", tx.getXid()); + } + return; + } try { triggerBeforeRollback(); tx.rollback(); @@ -285,6 +296,12 @@ private void rollbackTransaction(GlobalTransaction tx, Throwable originalExcepti } private void beginTransaction(TransactionInfo txInfo, GlobalTransaction tx) throws TransactionalExecutor.ExecutionException { + if (tx.getGlobalTransactionRole() != GlobalTransactionRole.Launcher) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Ignore begin: just involved in global transaction [{}]", tx.getXid()); + } + return; + } try { triggerBeforeBegin(); tx.begin(txInfo.getTimeOut(), txInfo.getName()); @@ -346,7 +363,7 @@ private void triggerBeforeCommit() { } } - private void triggerAfterCommit() { + private void triggerAfterCommit(GlobalTransaction tx) { for (TransactionHook hook : getCurrentHooks()) { try { hook.afterCommit(); @@ -356,14 +373,17 @@ private void triggerAfterCommit() { } } - private void triggerAfterCompletion() { - for (TransactionHook hook : getCurrentHooks()) { - try { - hook.afterCompletion(); - } catch (Exception e) { - LOGGER.error("Failed execute afterCompletion in hook {}", e.getMessage(), e); + private void triggerAfterCompletion(GlobalTransaction tx) { + if (tx == null || tx.getGlobalTransactionRole() == GlobalTransactionRole.Launcher) { + for (TransactionHook hook : getCurrentHooks()) { + try { + hook.afterCompletion(); + } catch (Exception e) { + LOGGER.error("Failed execute afterCompletion in hook {}", e.getMessage(), e); + } } } + } private void cleanUp() {