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 f1375b996e4410e519658a6e527bbdc14dc87241 Merge: 674af05 ffcb1c2 Author: lenboo <[email protected]> AuthorDate: Tue Feb 23 10:22:17 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../plugin/alert/script/ScriptAlertChannel.java | 2 +- .../plugin/alert/script/ScriptSender.java | 14 +- .../plugin/alert/script/StreamGobbler.java | 7 + .../plugin/alert/script/ProcessUtilsTest.java | 4 +- .../plugin/alert/script/ScriptSenderTest.java | 6 +- .../script/shell/{example.sh => scriptExample.sh} | 18 +- .../test/script/shell/{scriptTest.sh => test.sh} | 16 +- .../server/worker/WorkerServer.java | 7 + .../worker/processor/TaskExecuteProcessor.java | 48 ++--- .../server/worker/processor/TaskKillProcessor.java | 8 + .../server/worker/runner/TaskExecuteThread.java | 48 ++--- .../server/worker/runner/WorkerManagerThread.java | 143 +++++++++++++++ .../worker/processor/TaskCallbackServiceTest.java | 4 +- .../worker/processor/TaskExecuteProcessorTest.java | 195 +++++++++++++++++++++ .../worker/runner/WorkerManagerThreadTest.java | 187 ++++++++++++++++++++ pom.xml | 2 + 16 files changed, 647 insertions(+), 62 deletions(-)
