From 898de4e49a6ef7e73b7e0ce220bc68498a8ef3c8 Mon Sep 17 00:00:00 2001
From: even <827656971@qq.com>
Date: Tue, 10 Jun 2025 09:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/engine/manager/impl/DefaultRunContextManager.java  | 3 ++-
 .../casic/ci/process/engine/manager/impl/MemoryLogManager.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java
index f840c1d3..5039c97f 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java
@@ -152,7 +152,8 @@ public class DefaultRunContextManager implements RunContextManager {
         }
         pipelineRunContext.changeContextStateAndChild(stateEnum);
     }
-    @Transactional(rollbackFor = Exception.class)
+    // 记录日志需要新事物，成功或失败不影响流水线执行
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
     public void toHistory(String pipelineId){
         log.info("========================开始入库");
         BaseRunContext context = getContext(pipelineId);
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java
index 664d3c05..cfc99a1d 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java
@@ -118,7 +118,7 @@ public class MemoryLogManager implements LoggerManager {
             }
         }
     }
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void flushMemory(List<TaskRunContext> taskContextList){
         log.info("流水线日志开始入库");
         List<PipTaskLog> insertList = new ArrayList<>();