This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a change to branch refactor-worker
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 8440001 Merge branch 'dev' into refactor-worker
add 4946e88 move dependent and conditions to master server (#2423)
add ef68681 Change the background color of the disabled state of the
radio button when the workflow goes online #2451 (#2453)
add 0f54149 exclude HadoopUtils Test (#2465)
add 2d04e47 Merge branch 'dev' into refactor-worker
No new revisions were added by this update.
Summary of changes:
.../dolphinscheduler/common/enums/TaskType.java | 2 +-
.../common/utils/DependentUtilsTest.java | 1 +
.../dolphinscheduler/dao/entity/TaskInstance.java | 15 +-
.../dolphinscheduler/dao/utils/DagHelper.java | 44 +++++
.../dao/entity/TaskInstanceTest.java | 14 +-
.../runner/ConditionsTaskExecThread.java} | 141 ++++++-------
.../master/runner/DependentTaskExecThread.java | 217 +++++++++++++++++++++
.../master/runner/MasterBaseTaskExecThread.java | 51 ++++-
.../server/master/runner/MasterExecThread.java | 35 +---
.../server/master/runner/MasterTaskExecThread.java | 14 +-
.../master/runner/SubProcessTaskExecThread.java | 12 +-
.../task/dependent => utils}/DependentExecute.java | 60 +++---
.../server/worker/task/TaskManager.java | 3 -
.../worker/task/dependent/DependentTask.java | 198 -------------------
.../src/main/resources/logback-master.xml | 26 ++-
.../ConditionsTaskTest.java} | 120 ++++++------
.../dependent => master}/DependentTaskTest.java | 68 +++++--
.../service/process/ProcessService.java | 35 +++-
.../home/pages/dag/_source/formModel/formModel.vue | 5 +
pom.xml | 6 +-
20 files changed, 631 insertions(+), 436 deletions(-)
rename
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/{worker/task/conditions/ConditionsTask.java
=> master/runner/ConditionsTaskExecThread.java} (50%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
rename
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/{worker/task/dependent
=> utils}/DependentExecute.java (87%)
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java
copy
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/{worker/task/dependent/DependentTaskTest.java
=> master/ConditionsTaskTest.java} (57%)
rename
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/{worker/task/dependent
=> master}/DependentTaskTest.java (66%)
