natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tenantCode propagation to DynamicCommandUtils.createCommand (#15956)

This commit is contained in:
刘阳阳(liuyangyang) 2024-05-09 13:06:22 +08:00 committed by GitHub
parent 8d336def61
commit ba5de75829
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtils.java
View File

@ -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;
}

2
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicCommandUtilsTest.java
View File

@ -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