This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new ba5de75829 Add tenantCode propagation to
DynamicCommandUtils.createCommand (#15956)
ba5de75829 is described below
commit ba5de75829f63f0816c9bf4fee7f7e1af4db6fa2
Author: 刘阳阳(liuyangyang) <[email protected]>
AuthorDate: Thu May 9 13:06:22 2024 +0800
Add tenantCode propagation to DynamicCommandUtils.createCommand (#15956)
---
.../server/master/runner/task/dynamic/DynamicCommandUtils.java | 1 +
.../server/master/runner/task/dynamic/DynamicCommandUtilsTest.java | 2 ++
2 files changed, 3 insertions(+)
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtils.java
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtils.java
index e360a8857e..2401562f15 100644
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtils.java
+++
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtils.java
@@ -65,6 +65,7 @@ public class DynamicCommandUtils {
command.setProcessInstancePriority(processInstance.getProcessInstancePriority());
command.setWorkerGroup(processInstance.getWorkerGroup());
command.setDryRun(processInstance.getDryRun());
+ command.setTenantCode(processInstance.getTenantCode());
return command;
}
diff --git
a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtilsTest.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtilsTest.java
index d238869f41..d9b9c82e66 100644
---
a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtilsTest.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtilsTest.java
@@ -54,6 +54,7 @@ class DynamicCommandUtilsTest {
processInstance.setWarningGroupId(1);
processInstance.setProcessInstancePriority(null); // update this
processInstance.setWorkerGroup("worker");
+ processInstance.setTenantCode("unit-root");
processInstance.setDryRun(0);
}
@@ -73,6 +74,7 @@ class DynamicCommandUtilsTest {
Assertions.assertEquals(processInstance.getProcessInstancePriority(),
command.getProcessInstancePriority());
Assertions.assertEquals(processInstance.getWorkerGroup(),
command.getWorkerGroup());
Assertions.assertEquals(processInstance.getDryRun(),
command.getDryRun());
+ Assertions.assertEquals(processInstance.getTenantCode(),
command.getTenantCode());
}
@Test