This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new e307ce7 [1.3.6-prepare][Fix-5150][Server] DB transaction failure
#5152 (#5203)
e307ce7 is described below
commit e307ce73dbfcad0cca520632ba2b6b4098c3dbc1
Author: Shiwen Cheng <[email protected]>
AuthorDate: Fri Apr 2 23:34:16 2021 +0800
[1.3.6-prepare][Fix-5150][Server] DB transaction failure #5152 (#5203)
---
.../java/org/apache/dolphinscheduler/server/master/MasterServer.java | 2 ++
.../java/org/apache/dolphinscheduler/server/worker/WorkerServer.java | 2 ++
2 files changed, 4 insertions(+)
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index e126b16..6c05554 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -42,6 +42,7 @@ import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* master server
@@ -53,6 +54,7 @@ import org.springframework.context.annotation.FilterType;
"org.apache.dolphinscheduler.server.log.*"
})
})
+@EnableTransactionManagement
public class MasterServer implements IStoppable {
/**
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index 961f88f..bd8f022 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -44,6 +44,7 @@ import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* worker server
@@ -57,6 +58,7 @@ import org.springframework.context.annotation.FilterType;
"org.apache.dolphinscheduler.server.registry.ServerNodeManager"
})
})
+@EnableTransactionManagement
public class WorkerServer implements IStoppable {
/**
