This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 22729669f90540f6bf937ebe42e2e14f3b75eccf Merge: a32b40e 40bb92a Author: lenboo <[email protected]> AuthorDate: Wed Feb 24 17:50:26 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../alert/email/EmailAlertChannelFactory.java | 4 +- .../plugin/alert/email/EmailAlertChannelTest.java | 21 ++- .../server/master/MasterServer.java | 16 +- .../master/consumer/TaskPriorityQueueConsumer.java | 8 +- .../worker/processor/TaskExecuteProcessor.java | 2 +- .../worker/task/AbstractCommandExecutor.java | 64 ++++--- .../dolphinscheduler/server/zk/ZKMasterClient.java | 11 ++ .../worker/shell/ShellCommandExecutorTest.java | 184 +++++++++++++++++++-- .../server/worker/task/shell/ShellTaskTest.java | 4 +- .../queue/PeerTaskInstancePriorityQueue.java | 24 +++ .../service/queue/TaskPriorityQueue.java | 13 ++ .../service/queue/TaskPriorityQueueImpl.java | 15 ++ .../queue/PeerTaskInstancePriorityQueueTest.java | 65 ++++++-- .../service/queue/TaskPriorityQueueImplTest.java} | 87 ++++++++-- .../src/test/java/queue/TaskUpdateQueueTest.java | 57 ------- dolphinscheduler-ui.zip | Bin 946313 -> 0 bytes .../pages/definition/pages/list/_source/start.vue | 30 ++-- 17 files changed, 425 insertions(+), 180 deletions(-)
