This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 674af05 Merge remote-tracking branch 'upstream/dev' into spilit
add c4131d9 [alert-script]alert msg should contains content
add 6b56a78 [alert-script]alert msg should contains content
add d83719f test
add 4275bde [Improvement][spi-alert]script plugin should contain alert
content
add 35fc7dd Merge branch 'dev' into script_thread
add af00de3 [Improvement][spi-alert]script plugin should contain alert
content
add 2852420 Merge branch 'dev' into script_thread
add 5e1be06 [Improvement][spi-alert]script plugin should contain alert
content
add cf042cc rename example.sh
add 0d1bbd8 Merge pull request #4814 from CalvinKirs/script_thread
add ffcb1c2 [Improvement-#3735] Make task delayed execution more
efficient (#4812)
new f1375b9 Merge remote-tracking branch 'upstream/dev' into spilit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 +++++++++++++++++++++
...hreadTest.java => WorkerManagerThreadTest.java} | 83 +++++----
pom.xml | 2 +
16 files changed, 501 insertions(+), 104 deletions(-)
rename
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/script/shell/{example.sh
=> scriptExample.sh} (80%)
rename
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/script/shell/{scriptTest.sh
=> test.sh} (87%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessorTest.java
copy
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/{TaskExecuteThreadTest.java
=> WorkerManagerThreadTest.java} (76%)
