This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a change to branch dev
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 9dfc93e Exclude .mvn/jvm.config and
.mvn/wrapper/maven-wrapper.properties (#2387)
new 9a70e77 1，remove dolphinscheduler-rpc module 2，add
dolphinscheduler-remote module 3，add dolphinscheduler-service module 4，refactor
LoggerServer module (#1925)
new 29f2b41 Refactor architecture (#1926)
new e0a5a15 dolphinscheduler-common remove spring (#1931)
new e6de6db SpringApplicationContext class title add license (#1932)
new 05abf8b add license (#1934)
new d3f8bb0 Refactor architecture (#1936)
new 69eebe6 Merge branch 'dev' into refactor-architecture
new f005379 LoggerServiceTest remove ProcessDao (#1944)
new a5c2b87 exclude jasper-compiler in case of runtime conflict (#1938)
new 55a5170 Merge remote-tracking branch
'remotes/upstream/refactor-architecture' into dev
new fb5de17 DataAnaylysisServiceTest and ProcessDefinitionService modify
new 3ff7b34 Merge remote-tracking branch 'remotes/upstream/dev' into dev
new 1ac1d58 remote module add comment
new ad00268 OSUtilsTest modify
new 1e812ca add finally block to close channel (#1951)
new 822b9b4 Merge remote-tracking branch
'remotes/upstream/refactor-architecture' into dev
new c1bba46 # Conflicts: #
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
new ba2df29 Merge remote-tracking branch 'remotes/upstream/dev' into dev
new 38a7ad1 1，quartz.properties add conf category
2，dolphinscheduler-daemon.sh modify
new 9dd6979 dolphinscheduler-binary.xml modify
new 5b6ce80 Merge remote-tracking branch 'remotes/upstream/dev' into dev
new b1a68c6 move datasource classes to dao module
new 52c87a6 fix send4LetterWord bug
new d14a108 exclude jasper-compiler in case of runtime conflict
new 0013896 Merge pull request #1 from apache/refactor-architecture
new 94f0af5 Merge pull request #2 from apache/refactor-architecture
new e39d6ba add finally block to close channel
new 8e154ec refactor log client service
new 820b84b add sendSync method
new 43bc566 Merge branch 'refactor-architecture' into
refactor-architecture
new b2e0b85 # Conflicts resolve : #
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
#
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/ExecuteTaskRequestCommand.java
#
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/ExecuteTaskResponseCommand.java
#
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/Ping.java
# dolphinscheduler-remote/src/m [...]
new ac932ba add sendAsync method (#1962)
new cfa882c Merge remote-tracking branch
'remotes/upstream/refactor-architecture' into dev
new 99b9c10 1，add sendAsync method 2，refactor LoggerClient
new 371a9d1 LogClientService modify
new f9500c5 Refactor worker (#1975)
new ac93d78 Refactor worker (#1979)
new e7c32af master/worker basic communication
new 910401f master/worker basic communication
new f6a2130 master/worker basic communication
new c39e511 master/worker basic communication
new 06927c2 master/worker basic communication
new 2bb2d0c master/worker basic communication
new d16a8aa add comment
new 6bf9814 Merge pull request #1981 from qiaozhanwei/refactor-worker
new 158322b add TaskResponseProcessor (#1983)
new ff86dc7 1, master persistent task 2. extract master and worker
communication model (#1992)
new 63b76d7 add TaskResponseProcessor
new 0e0c479 Merge branch 'refactor-worker' into refactor-worker
new 3800a2a Refactor worker (#1993)
new 9d89eb0 TaskExecutionContext create modify (#1994)
new d6ea202 Refactor worker (#1)
new 64d538e updates
new 9f1865b Merge branch 'refactor-worker' into refactor-worker
new 1b95314 Merge branch 'refactor-worker' into refactor-worker
new e467910 Refactor worker (#1997)
new c7be43c Refactor worker (#2000)
new 00cf259 buildAckCommand taskInstanceId not set modify (#2002)
new b7bfd2d java doc error modify (#2004)
new 6053f9b add comment (#2006)
new 6589220 Refactor worker (#2)
new 00c9b80 updates
new 39a02e6 Merge branch 'refactor-worker' into refactor-worker
new 303b1ac Merge pull request #3 from apache/refactor-worker
new 5dca139 add- register processor
new 1292b03 Refactor worker (#4)
new fc3dc71 Refactor worker (#5)
new ea95a16 Merge branch 'refactor-worker' into refactor-worker
new 33bf550 ExecutorManager interface add generic type (#2012)
new 89a70f8 Refactor worker (#6)
new 318a1c3 Merge branch 'refactor-worker' into refactor-worker
new 9dc9745 Refactor worker (#2018)
new 2bb5eba add TaskInstanceCacheManager receive Worker report
result，modify master polling db transfrom to cache (#2021)
new f0f8644 Refactor worker (#7)
new ac48c93 Refactor worker (#8)
new 67e7a6c add kill command
new 04b1e02 Refactor worker (#9)
new f2a7fea Merge branch 'refactor-worker' into refactor-worker
new 8c545ff Refactor worker (#2026)
new 1ce2dd2 Refactor worker (#2037)
new 7f94122 1，worker TaskPros use TaskExecutionContext replase TaskPros
2，Master kill Task , KillTaskProcessor modify (#2039)
new 3bad56c Refactor worker (#2042)
new 9d36eaf Refactor worker (#2044)
new bb3885c master add kill task logic (#2058)
new 7267068 Refactor worker (#10)
new 65d603b refactor heartbeat logic
new cdb3267 Merge pull request #11 from apache/refactor-worker
new 19ffe1d update registry and add worker group
new 3a3a962 Merge pull request #12 from apache/refactor-worker
new 894b292 Merge pull request #13 from apache/refactor-worker
new 952d6ed add worker group
new 7056a73 Merge pull request #14 from apache/refactor-worker
new ca70b5a add lowerWeight host manager
new 4d64ef0 Merge branch 'refactor-worker' into refactor-worker
new 71c11bd refactor kill logic (#2060)
new b52542f master kill task refactor (#2069)
new 72e8f8d host add host:port format (#2070)
new 15bf740 Refactor worker (#2081)
new 8aaee39 task prioriry refator (#2094)
new eb45ff9 TaskPriority refactor (#2097)
new 4eebde8 Refactor worker (#2103)
new 043df7e WorkerServer refactor (#2106)
new 189506c Merge pull request #15 from apache/refactor-worker
new b4e4a64 refactor kill logic
new b17d031 Merge pull request #16 from apache/refactor-worker
new b0f9cd7 Merge pull request #18 from apache/refactor-worker
new 09173e8 refactor ExecutionContext
new 1d4bf42 Merge pull request #19 from apache/refactor-worker
new 9964cf9 Merge pull request #20 from apache/refactor-worker
new b42357a Merge pull request #21 from apache/refactor-worker
new aeb8b85 refactor worker
new 5c62100 Merge branch 'refactor-worker' into refactor-worker
new d617f9d refactor worker registry (#2107)
new 0febd95 Refactor worker (#2115)
new 290772d Modify workgroupid parameter name (#2105)
new fd6f13f Refactor worker (#2121)
new 20af8ff cancelTaskInstance set TaskExecutionContext
host,logPath,executePath (#2126)
new f551913 split logback config into seperate child module logback
(#2120)
new a51f3ea Merge pull request #22 from apache/refactor-worker
new 76fd384 refactor worker registry
new c329388 Merge pull request #23 from apache/refactor-worker
new a4c2dfa refactor master server
new cc97052 refactor MasterSchedulerService
new 645529e Merge pull request #24 from apache/refactor-worker
new 932fc72 Merge branch 'refactor-worker' of
github.com:Technoboy-/incubator-dolphinscheduler into refactor-worker
new 621ebf6 Merge branch 'refactor-worker' into refactor-worker
new bbe2cd4 refactor worker group (#2132)
new fd2c2ee 1，encapsulate the parameters required by sqltask 2，SQLTask
optimization (#2135)
new 7f72df4 let quartz use the same datasource (#2137)
new 16eeaf5 Fix javadoc and DataxTaskTest UT error (#2147)
new 607ec3d ProcedureTask process test modify (#2159)
new 71b11e2 DataxTask process test modify (#2162)
new 75efbb5 Refactor worker (#2186)
new aa650b4 Worker group parameter modification (#2188)
new 11dde20 Refactor worker (#2189)
new e31b48f 1，get workergroup from zk modify 2，SpringConnectionFactory
repeat load modify (#2201)
new cc87850 1，master and worker register ip use OSUtils.getHost()
2，ProcessInstance host set ip:port format (#2209)
new 055bb28 worker fault tolerance modify (#2212)
new 99c28c7 modify parameters (#2203)
new ce2853a add master and worker properties and remove data quality
config (#2211)
new 0dab5cb Refactor worker (#2241)
new 1fcecc5 Refactor worker (#2248)
new d678447 Refactor worker (#2266)
new ede3776 worker ci ut yml (#2278)
new 052f9d1 UT Coverage rate test (#2276)
new 92fd647 Refactor worker (#2279)
new 1e5a114 add RandomSelectorTest, RoundRobinSelectorTest,
TaskCallbackServiceTest (#2291)
new 11e3bff timing online modify (#2296)
new 7da3523 [Refactor worker] fix cpu pressure may be too high bug (#2290)
new 62f7d21 add async queue and new a thread reslove taskResponse is
faster than taskAck to db (#2297)
new f112415 TaskManager refactor (#2302)
new ace907e [refactor-worker] simplify master、 worker、alert、dao
properties (#2304)
new 03e29b9 1，ZookeeperRegister use common.properties zookeeperRoot path
2，api start exclude org.apache.dolphinscheduler.server.* (#2307)
new e720ca5 Refactor worker (#2312)
new 5730bfe Refactor worker (#2319)
new 7e9f45e [Refactor worker] Optimize code , reduce cost time from 60ms
to 0.5ms (#2318)
new af8efe5 add worker group and remove worker group id in dll (#2313)
new 23ba035 add TaskResponseServiceTest (#2325)
new 68cb81f 1，add UT in pom 2，refactor TaskUpdateQueue (#2326)
new 3bafa97 Refactor worker (#2331)
new 195dfb5 remove zookeeper as task queue relevant config (#2330)
new c2cf8fb test
new 152c814 test
new 07cc10c [Refactor worker] correct config error and remove unuse
properties that may affect performance (#2337)
new 51925ea Merge remote-tracking branch
'remotes/upstream/refactor-worker' into dev
new 7cd1f91 test
new 70d6360 startup conflict reslove
new 94e8bb1 Merge remote-tracking branch 'remotes/upstream/dev' into dev
new fce6af0 [Refactor worker] correct config error and remove unuse
properties that may affect performance (#2343)
new c9620ab remove zookeeper as task queue config (#2344)
new ca096e3 Merge remote-tracking branch
'remotes/upstream/refactor-worker' into dev
new 4bda3cd conflict reslove
new 1f43925 remove ExecuteTaskRequestCommand and
ExecuteTaskResponseCommand
new be1494f refactor-worker merge to dev bug fix
new 94713ce refactor-worker merge to dev bug fix
new 433b41d refactor-worker merge to dev bug fix
new b5546dd refactor-worker merge to dev bug fix
new 41d8abd test
new 223bdec refactor-worker merge to dev bug fix
new 2ec668d refactor-worker merge to dev bug fix
new b45e70f refactor-worker merge to dev bug fix
new 1276e0d refactor-worker merge to dev bug fix
new 49944a4 javadoc compile error modify
new 3a066f2 javadoc compile error modify
new 785c34b fix bug:master fault tolerance error (#2350) (#2375)
new b35baa5 Merge remote-tracking branch
'remotes/upstream/refactor-worker' into dev
new 45ea2cc Merge remote-tracking branch 'remotes/upstream/dev' into dev
new 99e0f4f test
new eacc66d mysql and postgresql checkpoint full scale table modify
new ebca4d7 frontend conflict resolve
new 692b7ac datasource.properties modify
new e16a40a Merge remote-tracking branch 'remotes/upstream/dev' into dev
new 7ad7f65 Merge branch 'dev' into dev
new a412859 Merge remote-tracking branch 'origin/dev' into dev
new 18548ad modify datasource.properties postgresql password
new 0afe9a3 modify datasource.properties postgresql password
new f3c8583 mapper add Transactional and rollback
new 2b78010 modify ci_e2e.yml
new d4ad23d postgresql init.sql modify
new af2b318 update pom.xml
new 6ac5777 Merge remote-tracking branch 'remotes/upstream/dev' into dev
new 43b9906 modify UT
new a1c000e zk properties modify
new f65ab56 UT modify
new 62661f0 init.sql modify
new 46dbace init.sql modify
new 3b56ae2 init.sql modify
new f02e7e8 pom modify
new b581f02 add dao other mapper add in pom.xml
new 4160c21 update UT in pom.xml
new 9de9f18 update UT in pom.xml
new b1a773f update UT in pom.xml
new 66d587c update UT in pom.xml
new b2c92de update UT in pom.xml
new 9d06fe7 update UT in pom.xml
new ff535e7 update UT in pom.xml
new 4c90f04 Merge pull request #2380 from qiaozhanwei/dev
The 2440 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:
.github/workflows/ci_e2e.yml | 2 +-
.github/workflows/ci_ut.yml | 2 +-
.gitignore | 1 +
docker/postgres/docker-entrypoint-initdb/init.sql | 33 +-
.../conf/dolphinscheduler/conf/worker_logback.xml | 79 ++++
.../dolphinscheduler/alert/utils/MailUtils.java | 6 +-
.../alert/utils/PropertyUtils.java | 12 +
.../src/main/resources/alert.properties | 18 +-
.../src/main/resources/logback-alert.xml | 52 +++
.../dolphinscheduler/api/ApiApplicationServer.java | 8 +-
.../api/controller/ExecutorController.java | 14 +-
.../api/controller/LoggerController.java | 8 +-
.../api/controller/ProcessInstanceController.java | 8 +-
.../api/controller/SchedulerController.java | 16 +-
.../api/controller/WorkerGroupController.java | 4 +-
.../dolphinscheduler/api/dto/ProcessMeta.java | 13 -
.../api/service/DataAnalysisService.java | 7 +-
.../api/service/ExecutorService.java | 41 +-
.../api/service/LoggerService.java | 5 +-
.../api/service/ProcessDefinitionService.java | 22 +-
.../api/service/ProcessInstanceService.java | 61 +--
.../api/service/SchedulerService.java | 12 +-
.../api/service/WorkerGroupService.java | 28 +-
.../src/main/resources/logback-api.xml | 62 +++
.../api/service/DataAnalysisServiceTest.java | 30 +-
.../api/service/ExecutorService2Test.java | 10 +-
.../api/service/LoggerServiceTest.java | 13 +-
.../api/service/ProcessDefinitionServiceTest.java | 32 +-
.../api/service/ProcessInstanceServiceTest.java | 14 +-
.../api/service/WorkerGroupServiceTest.java | 17 +-
.../apache/dolphinscheduler/common/Constants.java | 217 ++++-----
.../dolphinscheduler/common/enums/CommandType.java | 9 +
.../dolphinscheduler/common/enums/DbType.java | 10 +
.../common/enums/ExecutionStatus.java | 9 +
.../common/enums/TaskTimeoutStrategy.java | 35 +-
.../dolphinscheduler/common/enums/UdfType.java | 11 +
.../dolphinscheduler/common/model/TaskNode.java | 19 +-
.../dolphinscheduler/common/process/Property.java | 3 +-
.../common/task/AbstractParameters.java | 4 +-
.../dolphinscheduler/common/task/IParameters.java | 2 +-
.../dolphinscheduler/common/thread/Stopper.java | 2 +-
.../common/thread/ThreadPoolExecutors.java | 2 +-
.../common/thread/ThreadUtils.java | 73 +--
.../dolphinscheduler/common/utils/CommonUtils.java | 29 +-
.../dolphinscheduler/common/utils/DateUtils.java | 2 +-
.../dolphinscheduler/common/utils/FileUtils.java | 38 +-
.../dolphinscheduler/common/utils/HadoopUtils.java | 41 +-
.../dolphinscheduler/common/utils/OSUtils.java | 2 +
.../common/utils/Preconditions.java | 20 +-
.../common/utils/PropertyUtils.java | 32 +-
.../dolphinscheduler/common/utils/ResInfo.java | 51 +--
.../common/utils/dependent/DependentDateUtils.java | 51 ++-
.../common/utils/placeholder/PlaceholderUtils.java | 10 +-
.../src/main/resources/common.properties | 80 ++--
.../src/main/resources/logback.xml | 169 -------
.../common/utils/CommonUtilsTest.java | 5 -
.../dolphinscheduler/common/utils/ResInfoTest.java | 43 --
.../placeholder/TimePlaceholderUtilsTest.java | 64 +--
.../org/apache/dolphinscheduler/dao/AlertDao.java | 5 +-
.../apache/dolphinscheduler/dao/TaskRecordDao.java | 34 +-
.../dao/datasource/BaseDataSource.java | 1 +
.../dao/datasource/ConnectionFactory.java | 27 +-
.../dao/datasource/DB2ServerDataSource.java | 3 +-
.../dao/datasource/DataSourceFactory.java | 6 +
.../dao/datasource/HiveDataSource.java | 3 +-
.../dao/datasource/MySQLDataSource.java | 3 +-
.../dao/datasource/OracleDataSource.java | 16 +-
.../dao/datasource/PostgreDataSource.java | 3 +-
.../dao/datasource/SQLServerDataSource.java | 46 ++
.../dao/datasource/SparkDataSource.java | 3 +-
.../dao/datasource/SpringConnectionFactory.java | 85 ++--
.../dolphinscheduler/dao/entity/Command.java | 24 +-
.../dao/entity/ProcessInstance.java | 39 +-
.../dolphinscheduler/dao/entity/Schedule.java | 15 +-
.../dolphinscheduler/dao/entity/TaskInstance.java | 43 +-
.../dolphinscheduler/dao/entity/UdfFunc.java | 36 +-
.../dao/mapper/DataSourceMapper.java | 2 +
.../dao/mapper/ProcessInstanceMapper.java | 14 +
.../dao/mapper/ResourceMapper.java | 14 +-
.../dao/mapper/ScheduleMapper.java | 4 +-
.../dolphinscheduler/dao/mapper/UdfFuncMapper.java | 5 +-
.../dolphinscheduler/dao/utils/PropertyUtils.java | 55 ++-
.../src/main/resources/application.properties | 149 ------
.../src/main/resources/datasource.properties | 13 +-
.../dao/mapper/ProcessInstanceMapper.xml | 7 +-
.../apache/dolphinscheduler/dao/AlertDaoTest.java | 7 -
.../dao/mapper/CommandMapperTest.java | 15 +-
.../dao/mapper/DataSourceUserMapperTest.java | 6 +-
.../dao/mapper/ErrorCommandMapperTest.java | 33 +-
.../dao/mapper/ProcessDefinitionMapperTest.java | 16 +-
.../dao/mapper/ProcessInstanceMapMapperTest.java | 27 +-
.../dao/mapper/ProcessInstanceMapperTest.java | 8 +-
.../dao/mapper/ProjectMapperTest.java | 17 +-
.../dao/mapper/ProjectUserMapperTest.java | 14 +-
.../dao/mapper/QueueMapperTest.java | 10 +-
.../dao/mapper/ResourceMapperTest.java | 15 +-
.../dao/mapper/ResourceUserMapperTest.java | 6 +-
.../dao/mapper/ScheduleMapperTest.java | 20 +-
.../dao/mapper/SessionMapperTest.java | 9 +-
.../dao/mapper/TaskInstanceMapperTest.java | 4 +
.../dao/mapper/TenantMapperTest.java | 10 +-
.../dao/mapper/UDFUserMapperTest.java | 14 +-
.../dao/mapper/UdfFuncMapperTest.java | 15 -
.../dao/mapper/UserAlertGroupMapperTest.java | 13 +-
.../dao/mapper/UserMapperTest.java | 69 ++-
.../dao/mapper/WorkerGroupMapperTest.java | 135 ------
.../remote/NettyRemotingClient.java | 98 ++--
.../remote/command/CommandType.java | 2 +-
.../remote/command/ExecuteTaskRequestCommand.java | 1 -
.../remote/command/ExecuteTaskResponseCommand.java | 1 -
.../remote/command/TaskExecuteAckCommand.java | 1 +
.../remote/command/TaskExecuteRequestCommand.java | 1 +
.../remote/command/TaskExecuteResponseCommand.java | 1 +
.../dolphinscheduler/remote/command/TaskInfo.java | 250 +++++++++++
.../remote/command/TaskKillRequestCommand.java | 1 +
.../remote/command/TaskKillResponseCommand.java | 1 +
.../remote/handler/NettyClientHandler.java | 105 +++--
.../remote/handler/NettyServerHandler.java | 2 +-
.../dolphinscheduler/remote/utils/Address.java | 96 ----
.../remote/utils/ChannelUtils.java | 4 +-
.../dolphinscheduler/remote/utils/Constants.java | 3 +
.../remote/utils/FastJsonSerializer.java | 2 +-
.../apache/dolphinscheduler/remote/utils/Host.java | 117 +++++
.../dolphinscheduler/remote/utils/IPUtils.java | 142 ++++++
.../apache/dolphinscheduler/remote/utils/Pair.java | 4 +
.../remote/NettyRemotingClientTest.java | 6 +-
dolphinscheduler-server/pom.xml | 10 +-
.../builder/TaskExecutionContextBuilder.java | 140 ++++++
.../server/entity/DataxTaskExecutionContext.java | 116 +++++
.../entity/DependenceTaskExecutionContext.java | 33 +-
.../entity/ProcedureTaskExecutionContext.java | 32 +-
.../server/entity/SQLTaskExecutionContext.java | 78 ++++
.../server/entity/SqoopTaskExecutionContext.java | 116 +++++
.../server/entity/TaskExecutionContext.java | 499 +++++++++++++++++++++
.../server/entity/TaskPriority.java | 147 ++++++
.../server/log/LoggerRequestProcessor.java | 16 +-
.../server}/log/MasterLogFilter.java | 2 +-
.../server}/log/SensitiveDataConverter.java | 2 +-
.../server}/log/TaskLogDiscriminator.java | 2 +-
.../server}/log/TaskLogFilter.java | 2 +-
.../server}/log/WorkerLogFilter.java | 2 +-
.../server/master/MasterServer.java | 191 +++-----
.../master/cache/TaskInstanceCacheManager.java | 64 +++
.../cache/impl/TaskInstanceCacheManagerImpl.java | 119 +++++
.../server/master/config/MasterConfig.java | 44 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 353 +++++++++++++++
.../server/master/dispatch/ExecutorDispatcher.java | 118 +++++
.../master/dispatch/context/ExecutionContext.java | 86 ++++
.../server/master/dispatch/enums/ExecutorType.java | 10 +-
.../dispatch/exceptions/ExecuteException.java | 51 ++-
.../dispatch/executor/AbstractExecutorManager.java | 26 +-
.../master/dispatch/executor/ExecutorManager.java | 57 +++
.../dispatch/executor/NettyExecutorManager.java | 200 +++++++++
.../master/dispatch/host/CommonHostManager.java | 88 ++++
.../server/master/dispatch/host/HostManager.java | 21 +-
.../master/dispatch/host/HostManagerConfig.java | 64 +++
.../dispatch/host/LowerWeightHostManager.java | 171 +++++++
.../master/dispatch/host/RandomHostManager.java | 32 +-
.../dispatch/host/RoundRobinHostManager.java | 33 +-
.../master/dispatch/host/assign/HostSelector.java | 25 +-
.../master/dispatch/host/assign/HostWeight.java | 73 +++
.../host/assign/LowerWeightRoundRobin.java | 52 +++
.../dispatch/host/assign/RandomSelector.java | 55 +--
.../dispatch/host/assign/RoundRobinSelector.java | 38 +-
.../master/dispatch/host/assign/Selector.java | 22 +-
.../server/master/future/TaskFuture.java | 100 ++---
.../server/master/processor/TaskAckProcessor.java | 86 ++++
.../processor/TaskKillResponseProcessor.java | 53 +++
.../master/processor/TaskResponseProcessor.java | 85 ++++
.../master/processor/queue/TaskResponseEvent.java | 186 ++++++++
.../processor/queue/TaskResponseService.java | 150 +++++++
.../server/master/registry/MasterRegistry.java | 151 +++++++
.../master/runner/MasterBaseTaskExecThread.java | 109 ++++-
.../server/master/runner/MasterExecThread.java | 58 ++-
...ulerThread.java => MasterSchedulerService.java} | 106 +++--
.../server/master/runner/MasterTaskExecThread.java | 51 ++-
.../dolphinscheduler/server/monitor/Monitor.java | 5 +
.../server/registry/ZookeeperNodeManager.java | 272 +++++++++++
.../server/registry/ZookeeperRegistryCenter.java | 197 ++++++++
.../dolphinscheduler/server/utils/ParamUtils.java | 22 +
.../server/utils/ProcessUtils.java | 47 +-
.../dolphinscheduler/server/utils/UDFUtils.java | 6 +
.../server/worker/WorkerServer.java | 304 ++-----------
.../cache/TaskExecutionContextCacheManager.java | 31 +-
.../impl/TaskExecutionContextCacheManagerImpl.java | 68 +++
.../server/worker/config/WorkerConfig.java | 41 +-
.../worker/processor/NettyRemoteChannel.java | 76 ++++
.../worker/processor/TaskCallbackService.java | 151 +++++++
.../worker/processor/TaskExecuteProcessor.java | 169 +++++++
.../server/worker/processor/TaskKillProcessor.java | 192 ++++++++
.../server/worker/registry/WorkerRegistry.java | 168 +++++++
.../server/worker/runner/FetchTaskThread.java | 365 ---------------
.../server/worker/runner/TaskExecuteThread.java | 235 ++++++++++
.../server/worker/runner/TaskScheduleThread.java | 365 ---------------
.../worker/task/AbstractCommandExecutor.java | 341 ++++++--------
.../server/worker/task/AbstractTask.java | 62 ++-
.../server/worker/task/AbstractYarnTask.java | 31 +-
.../server/worker/task/CommandExecuteResult.java | 49 +-
.../server/worker/task/PythonCommandExecutor.java | 34 +-
.../server/worker/task/ShellCommandExecutor.java | 46 +-
.../server/worker/task/TaskManager.java | 37 +-
.../server/worker/task/TaskProps.java | 110 +++--
.../worker/task/conditions/ConditionsTask.java | 29 +-
.../server/worker/task/datax/DataxTask.java | 135 +++---
.../worker/task/dependent/DependentTask.java | 26 +-
.../server/worker/task/flink/FlinkTask.java | 40 +-
.../server/worker/task/http/HttpTask.java | 41 +-
.../server/worker/task/mr/MapReduceTask.java | 34 +-
.../worker/task/processdure/ProcedureTask.java | 261 ++++++-----
.../server/worker/task/python/PythonTask.java | 56 ++-
.../server/worker/task/shell/ShellTask.java | 73 ++-
.../server/worker/task/spark/SparkTask.java | 36 +-
.../server/worker/task/sql/SqlTask.java | 386 ++++++++--------
.../server/worker/task/sqoop/SqoopTask.java | 27 +-
.../task/sqoop/generator/ISourceGenerator.java | 8 +-
.../task/sqoop/generator/ITargetGenerator.java | 10 +-
.../task/sqoop/generator/SqoopJobGenerator.java | 7 +-
.../generator/sources/HdfsSourceGenerator.java | 3 +-
.../generator/sources/HiveSourceGenerator.java | 3 +-
.../generator/sources/MysqlSourceGenerator.java | 16 +-
.../generator/targets/HdfsTargetGenerator.java | 3 +-
.../generator/targets/HiveTargetGenerator.java | 3 +-
.../generator/targets/MysqlTargetGenerator.java | 13 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 182 +++-----
.../dolphinscheduler/server/zk/ZKWorkerClient.java | 119 -----
.../src/main/resources/logback-master.xml | 58 +++
.../src/main/resources/logback-worker.xml | 83 ++++
.../src/main/resources/master.properties | 17 +-
.../src/main/resources/worker.properties | 14 +-
.../server}/log/MasterLogFilterTest.java | 2 +-
.../server}/log/SensitiveDataConverterTest.java | 2 +-
.../server}/log/TaskLogDiscriminatorTest.java | 2 +-
.../server}/log/TaskLogFilterTest.java | 2 +-
.../server}/log/WorkerLogFilterTest.java | 2 +-
.../server/master/MasterExecThreadTest.java | 2 +-
.../master/dispatch/ExecutorDispatcherTest.java | 82 ++++
.../executor/NettyExecutorManagerTest.java | 104 +++++
.../dispatch/host/RoundRobinHostManagerTest.java | 78 ++++
.../host/assign/LowerWeightRoundRobinTest.java | 33 +-
.../dispatch/host/assign/RandomSelectorTest.java | 51 +++
.../host/assign/RoundRobinSelectorTest.java | 55 +++
.../processor/queue/TaskResponseServiceTest.java | 66 +++
.../server/master/registry/MasterRegistryTest.java | 72 +++
.../server/registry/DependencyConfig.java | 147 ++++++
.../server/registry/ZookeeperNodeManagerTest.java | 107 +++++
.../server/utils/ExecutionContextTestUtils.java | 54 +++
.../worker/processor/TaskCallbackServiceTest.java | 130 ++++++
.../processor/TaskCallbackServiceTestConfig.java | 130 ++++++
.../server/worker/registry/WorkerRegistryTest.java | 77 ++++
.../worker/shell/ShellCommandExecutorTest.java | 8 +-
.../server/worker/sql/SqlExecutorTest.java | 11 +-
.../server/worker/task/datax/DataxTaskTest.java | 54 ++-
.../worker/task/dependent/DependentTaskTest.java | 4 +-
.../server/worker/task/shell/ShellTaskTest.java | 29 +-
.../server/worker/task/sqoop/SqoopTaskTest.java | 13 +-
.../dolphinscheduler/server/zk/SpringZKServer.java | 116 ++---
.../service/log/LogClientService.java | 8 +-
.../service/process/ProcessService.java | 121 ++---
.../service/quartz/DruidConnectionProvider.java | 190 +-------
.../service/quartz/ProcessScheduleJob.java | 25 +-
.../service/quartz/QuartzExecutors.java | 61 ++-
.../dolphinscheduler/service/queue/ITaskQueue.java | 102 -----
.../service/queue/TaskPriorityQueue.java | 29 +-
.../service/queue/TaskPriorityQueueImpl.java | 104 +++++
.../service/queue/TaskQueueFactory.java | 55 ---
.../service/queue/TaskQueueZkImpl.java | 375 ----------------
.../service/zk/AbstractListener.java} | 33 +-
.../service/zk/AbstractZKClient.java | 194 ++------
.../service/zk/ZookeeperCachedOperator.java | 9 +-
.../service/zk/ZookeeperConfig.java | 2 +-
.../src/main/resources/quartz.properties | 48 +-
.../src/main/resources/zookeeper.properties | 4 +-
.../service/queue/BaseTaskQueueTest.java | 49 --
.../service/queue/TaskQueueZKImplTest.java | 229 ----------
.../src/test/java/queue/TaskUpdateQueueTest.java | 59 +++
.../dag/_source/formModel/_source/workerGroups.vue | 4 +-
.../home/pages/dag/_source/formModel/formModel.vue | 18 +-
.../conf/home/pages/dag/_source/formModel/log.vue | 4 +-
.../home/pages/dag/_source/startingParam/index.vue | 2 +-
.../pages/dag/_source/udp/_source/selectTenant.vue | 6 +-
.../pages/definition/pages/list/_source/start.vue | 6 +-
.../pages/definition/pages/list/_source/timing.vue | 8 +-
.../src/js/conf/home/router/index.js | 8 -
.../src/js/conf/home/store/dag/actions.js | 2 +-
.../src/js/conf/home/store/security/actions.js | 17 +-
.../components/secondaryMenu/_source/menu.js | 9 -
pom.xml | 179 +++++---
script/dolphinscheduler-daemon.sh | 8 +-
sql/dolphinscheduler-postgre.sql | 31 +-
sql/dolphinscheduler_mysql.sql | 259 +++++++----
.../1.2.2_schema/mysql/dolphinscheduler_ddl.sql | 125 +++++-
.../postgresql/dolphinscheduler_ddl.sql | 130 ++++++
292 files changed, 10888 insertions(+), 6109 deletions(-)
create mode 100644 dockerfile/conf/dolphinscheduler/conf/worker_logback.xml
create mode 100644 dolphinscheduler-alert/src/main/resources/logback-alert.xml
create mode 100644 dolphinscheduler-api/src/main/resources/logback-api.xml
delete mode 100644 dolphinscheduler-common/src/main/resources/logback.xml
delete mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ResInfoTest.java
delete mode 100644
dolphinscheduler-dao/src/main/resources/application.properties
copy dockerfile/conf/dolphinscheduler/datasource.properties.tpl =>
dolphinscheduler-dao/src/main/resources/datasource.properties (86%)
delete mode 100644
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java
delete mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/ExecuteTaskRequestCommand.java
delete mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/ExecuteTaskResponseCommand.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRequestCommand.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteResponseCommand.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskInfo.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
delete mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Address.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Host.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/IPUtils.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/DataxTaskExecutionContext.java
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/DependenceTaskExecutionContext.java
(61%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ClickHouseDataSource.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/ProcedureTaskExecutionContext.java
(58%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/SQLTaskExecutionContext.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/SqoopTaskExecutionContext.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/TaskExecutionContext.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/entity/TaskPriority.java
copy {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server}/log/MasterLogFilter.java
(96%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server}/log/SensitiveDataConverter.java
(98%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server}/log/TaskLogDiscriminator.java
(97%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server}/log/TaskLogFilter.java
(97%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server}/log/WorkerLogFilter.java
(96%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/cache/TaskInstanceCacheManager.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/cache/impl/TaskInstanceCacheManagerImpl.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/ExecutorDispatcher.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/context/ExecutionContext.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/enums/ExecutorType.java
(85%)
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/exceptions/RemotingException.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/exceptions/ExecuteException.java
(63%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/executor/AbstractExecutorManager.java
(52%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/executor/ExecutorManager.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/executor/NettyExecutorManager.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/CommonHostManager.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/HostManager.java
(69%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/HostManagerConfig.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/LowerWeightHostManager.java
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/RandomHostManager.java
(57%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ClickHouseDataSource.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/RoundRobinHostManager.java
(56%)
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IOUtils.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/HostSelector.java
(66%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/HostWeight.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobin.java
rename
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/MasterLogFilter.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RandomSelector.java
(52%)
copy
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UserAlertGroupService.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RoundRobinSelector.java
(52%)
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/Selector.java
(76%)
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/ResponseFuture.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/future/TaskFuture.java
(63%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessor.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessor.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskResponseProcessor.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseEvent.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseService.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java
rename
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/{MasterSchedulerThread.java
=> MasterSchedulerService.java} (60%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManager.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/ZookeeperRegistryCenter.java
copy e2e/src/test/java/org/apache/dolphinscheduler/data/LoginData.java =>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/cache/TaskExecutionContextCacheManager.java
(54%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/cache/impl/TaskExecutionContextCacheManagerImpl.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/NettyRemoteChannel.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/CommandHeader.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/CommandExecuteResult.java
(53%)
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClient.java
create mode 100644
dolphinscheduler-server/src/main/resources/logback-master.xml
create mode 100644
dolphinscheduler-server/src/main/resources/logback-worker.xml
copy dockerfile/conf/dolphinscheduler/master.properties.tpl =>
dolphinscheduler-server/src/main/resources/master.properties (74%)
copy dockerfile/conf/dolphinscheduler/worker.properties.tpl =>
dolphinscheduler-server/src/main/resources/worker.properties (78%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server}/log/MasterLogFilterTest.java
(98%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server}/log/SensitiveDataConverterTest.java
(99%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server}/log/TaskLogDiscriminatorTest.java
(98%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server}/log/TaskLogFilterTest.java
(98%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server}/log/WorkerLogFilterTest.java
(98%)
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/ExecutorDispatcherTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/executor/NettyExecutorManagerTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/RoundRobinHostManagerTest.java
copy
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/ConstantsTest.java
=>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobinTest.java
(52%)
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RandomSelectorTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RoundRobinSelectorTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/DependencyConfig.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManagerTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ExecutionContextTestUtils.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackServiceTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackServiceTestConfig.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryTest.java
copy
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
=>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/SpringZKServer.java
(57%)
delete mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/ITaskQueue.java
copy e2e/src/main/java/org/apache/dolphinscheduler/constant/TestConstant.java
=>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskPriorityQueue.java
(66%)
create mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskPriorityQueueImpl.java
delete mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueFactory.java
delete mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueZkImpl.java
copy
dolphinscheduler-service/src/{test/java/org/apache/dolphinscheduler/service/zk/ZKServerTest.java
=> main/java/org/apache/dolphinscheduler/service/zk/AbstractListener.java}
(55%)
copy dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl =>
dolphinscheduler-service/src/main/resources/zookeeper.properties (92%)
delete mode 100644
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/BaseTaskQueueTest.java
delete mode 100644
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/TaskQueueZKImplTest.java
create mode 100644
dolphinscheduler-service/src/test/java/queue/TaskUpdateQueueTest.java
mode change 100755 => 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
