You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2020/06/30 08:50:33 UTC
[incubator-dolphinscheduler] 01/01: Merge pull request #3095 from
apache/dev-merge
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 2d0fe8a8c68d915de0852da53198ebeb1cc48ae6
Merge: 5bac559 6613f82
Author: bao liang <29...@users.noreply.github.com>
AuthorDate: Tue Jun 30 16:50:17 2020 +0800
Merge pull request #3095 from apache/dev-merge
branch dev merge from dev-1.3.0
.github/workflows/ci_e2e.yml | 2 +-
.github/workflows/ci_ut.yml | 2 +-
LICENSE | 16 +
NOTICE | 72 +-
README.md | 17 +-
README_zh_CN.md | 17 +-
ambari_plugin/README.md | 106 +-
.../common-services/DOLPHIN/1.3.0/alerts.json | 62 +-
.../DOLPHIN/1.3.0/configuration/dolphin-alert.xml | 6 -
.../1.3.0/configuration/dolphin-datasource.xml | 261 --
.../DOLPHIN/1.3.0/configuration/dolphin-worker.xml | 9 -
.../1.3.0/configuration/dolphin-zookeeper.xml | 8 -
.../common-services/DOLPHIN/1.3.0/metainfo.xml | 4 +-
.../1.3.0/package/scripts/dolphin_alert_service.py | 3 +-
.../1.3.0/package/scripts/dolphin_api_service.py | 3 +-
.../package/scripts/dolphin_logger_service.py | 4 +-
.../package/scripts/dolphin_master_service.py | 3 +-
.../package/scripts/dolphin_worker_service.py | 3 +-
.../DOLPHIN/1.3.0/package/scripts/params.py | 4 -
dolphinscheduler-alert/pom.xml | 2 +-
.../alert/template/impl/DefaultHTMLTemplate.java | 19 +-
.../dolphinscheduler/alert/utils/Constants.java | 4 +
.../src/main/resources/logback-alert.xml | 2 +-
.../template/impl/DefaultHTMLTemplateTest.java | 43 +-
dolphinscheduler-api/pom.xml | 2 +-
.../api/controller/DataSourceController.java | 2 +-
.../apache/dolphinscheduler/api/enums/Status.java | 2 +-
.../api/service/DataSourceService.java | 41 +-
.../api/service/ProcessInstanceService.java | 5 +-
.../api/service/ResourcesService.java | 66 +-
.../dolphinscheduler/api/service/UsersService.java | 65 +-
.../api/service/DataSourceServiceTest.java | 65 +-
.../api/service/ResourcesServiceTest.java | 14 +-
dolphinscheduler-common/pom.xml | 2 +-
.../apache/dolphinscheduler/common/Constants.java | 13 +-
.../common/enums/ExecutionStatus.java | 11 +-
.../dolphinscheduler/common/model/TaskNode.java | 13 +
.../common/task/datax/DataxParameters.java | 13 +-
.../dolphinscheduler/common/utils/DateUtils.java | 2 +-
.../common/utils/DependentUtils.java | 6 +
.../dolphinscheduler/common/utils/HadoopUtils.java | 20 +-
.../common/utils/ParameterUtils.java | 22 +-
.../dolphinscheduler/common/utils/ResInfo.java | 8 +-
.../common/utils/ScriptRunner.java | 34 +-
.../common/utils/dependent/DependentDateUtils.java | 27 +
.../src/main/resources/common.properties | 32 +-
.../common/shell/ShellExecutorTest.java | 49 +-
.../common/utils/DependentUtilsTest.java | 40 +
.../common/utils/HadoopUtilsTest.java | 4 +-
dolphinscheduler-dao/pom.xml | 2 +-
.../dao/datasource/BaseDataSource.java | 13 +-
.../dao/datasource/MySQLDataSource.java | 47 +
.../dao/datasource/OracleDataSource.java | 12 +-
.../dolphinscheduler/dao/entity/ProcessData.java | 10 +
.../dao/mapper/ProcessDefinitionMapper.java | 7 +
.../dao/upgrade/DolphinSchedulerManager.java | 7 +-
.../dao/upgrade/ProcessDefinitionDao.java | 92 +
.../dolphinscheduler/dao/upgrade/UpgradeDao.java | 64 +-
.../dao/upgrade/WorkerGroupDao.java | 65 +
.../src/main/resources/datasource.properties | 3 +-
.../dao/mapper/ProcessDefinitionMapper.xml | 6 +
.../dolphinscheduler/dao/mapper/UserMapper.xml | 6 +-
.../dao/mapper/WorkerGroupMapper.xml | 40 -
.../dao/datasource/MySQLDataSourceTest.java | 64 +
.../dao/datasource/OracleDataSourceTest.java | 8 +-
.../dao/mapper/ProcessDefinitionMapperTest.java | 27 +-
.../dao/upgrade/ProcessDefinitionDaoTest.java | 65 +
.../dao/upgrade/UpgradeDaoTest.java | 26 +-
.../dao/upgrade/WokrerGrouopDaoTest.java | 51 +
dolphinscheduler-dist/pom.xml | 4 +-
dolphinscheduler-dist/release-docs/LICENSE | 50 +-
dolphinscheduler-dist/release-docs/NOTICE | 92 +-
.../release-docs/licenses/LICENSE-ant-1.6.5.txt | 203 ++
.../release-docs/licenses/LICENSE-commons-el.txt | 60 -
...-framework.txt => LICENSE-commons-lang-2.6.txt} | 0
.../release-docs/licenses/LICENSE-core-3.1.1.txt | 70 +
...mons-lang3.txt => LICENSE-curator-framwork.txt} | 0
.../release-docs/licenses/LICENSE-freemarker.txt | 49 -
.../release-docs/licenses/LICENSE-grpc-context.txt | 36 -
.../release-docs/licenses/LICENSE-grpc-core.txt | 36 -
.../release-docs/licenses/LICENSE-grpc-netty.txt | 36 -
.../licenses/LICENSE-grpc-protobuf-little.txt | 36 -
.../licenses/LICENSE-grpc-protobuf.txt | 36 -
.../release-docs/licenses/LICENSE-grpc-stub.txt | 36 -
.../release-docs/licenses/LICENSE-h2-1.4.200.txt | 552 +++
.../licenses/LICENSE-instrumentation-api.txt | 201 --
.../licenses/LICENSE-jackson-annotations.txt | 0
.../release-docs/licenses/LICENSE-jackson-core.txt | 0
.../licenses/LICENSE-jackson-databind.txt | 0
.../licenses/LICENSE-jasper-compiler.txt | 202 --
.../licenses/LICENSE-jasper-runtime.txt | 14 -
.../licenses/LICENSE-jsp-api-2.1-6.1.14.txt | 53 +
.../licenses/LICENSE-log4j-api-2.11.2.txt | 53 +
...mons-lang.txt => LICENSE-log4j-core-2.11.2.txt} | 2 +-
.../release-docs/licenses/LICENSE-netty-buffer.txt | 201 --
.../licenses/LICENSE-netty-code-http.txt | 201 --
.../licenses/LICENSE-netty-codec-http2.txt | 201 --
.../licenses/LICENSE-netty-codec-socks.txt | 201 --
.../release-docs/licenses/LICENSE-netty-codec.txt | 201 --
.../release-docs/licenses/LICENSE-netty-common.txt | 201 --
.../licenses/LICENSE-netty-handler-proxy.txt | 201 --
.../licenses/LICENSE-netty-handler.txt | 201 --
.../licenses/LICENSE-netty-resolver.txt | 201 --
.../licenses/LICENSE-netty-transport.txt | 201 --
.../licenses/LICENSE-opencensus-api.txt | 202 --
.../LICENSE-opencensus-contrib-grpc-metrics.txt | 202 --
.../LICENSE-proto-google-common-protos.txt | 202 --
.../licenses/LICENSE-protobuf-java-util.txt | 42 -
.../licenses/ui-licenses/LICENSE-normalize | 8 -
dolphinscheduler-microbench/pom.xml | 2 +-
dolphinscheduler-plugin-api/pom.xml | 2 +-
dolphinscheduler-remote/pom.xml | 2 +-
.../remote/NettyRemotingClient.java | 2 +-
.../remote/command/CommandType.java | 2 +-
.../command/log/RemoveTaskLogRequestCommand.java | 63 +
.../command/log/RemoveTaskLogResponseCommand.java | 63 +
.../remote/RemoveTaskLogRequestCommandTest.java | 32 +-
.../remote/RemoveTaskLogResponseCommandTest.java | 31 +-
dolphinscheduler-server/pom.xml | 2 +-
.../server/log/LoggerRequestProcessor.java | 35 +-
.../dolphinscheduler/server/log/LoggerServer.java | 1 +
.../server/master/config/MasterConfig.java | 11 +
.../master/consumer/TaskPriorityQueueConsumer.java | 60 +-
.../server/master/dispatch/ExecutorDispatcher.java | 5 +-
.../dispatch/host/LowerWeightHostManager.java | 49 +-
.../server/master/processor/TaskAckProcessor.java | 2 +-
.../server/master/registry/MasterRegistry.java | 33 +-
.../master/runner/DependentTaskExecThread.java | 2 +-
.../server/master/runner/MasterExecThread.java | 15 +-
.../server/master/runner/MasterTaskExecThread.java | 29 +-
.../dolphinscheduler/server/monitor/RunConfig.java | 15 +-
.../server/registry/HeartBeatTask.java | 84 +
.../server/utils/DependentExecute.java | 32 +-
.../server/worker/config/WorkerConfig.java | 2 +-
.../worker/processor/TaskCallbackService.java | 42 +-
.../server/worker/processor/TaskKillProcessor.java | 1 +
.../server/worker/registry/WorkerRegistry.java | 33 +-
.../server/worker/runner/TaskExecuteThread.java | 10 +
.../worker/task/AbstractCommandExecutor.java | 83 +-
.../server/worker/task/ShellCommandExecutor.java | 7 +-
.../server/worker/task/datax/DataxTask.java | 59 +-
.../server/worker/task/shell/ShellTask.java | 2 +-
.../server/worker/task/sql/SqlTask.java | 2 +-
.../generator/sources/MysqlSourceGenerator.java | 4 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 5 +-
.../src/main/resources/config/install_config.conf | 32 +-
.../src/main/resources/master.properties | 8 +-
.../src/main/resources/worker.properties | 9 +-
.../server/log/LoggerServerTest.java | 62 +
.../server/master/DependentTaskTest.java | 64 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 3 +-
.../server/master/registry/MasterRegistryTest.java | 4 +-
.../master/runner/MasterTaskExecThreadTest.java | 41 +-
.../server/registry/DependencyConfig.java | 5 +
.../worker/processor/TaskCallbackServiceTest.java | 34 +-
.../server/worker/registry/WorkerRegistryTest.java | 4 +-
.../server/worker/task/datax/DataxTaskTest.java | 1 +
dolphinscheduler-service/pom.xml | 24 +-
.../service/log/LogClientService.java | 30 +
.../service/permission/PermissionCheck.java | 4 +
.../service/process/ProcessService.java | 65 +-
.../service/quartz/ProcessScheduleJob.java | 4 +-
.../service/zk/AbstractZKClient.java | 17 +-
.../dolphinscheduler/service/zk/ZKServer.java | 5 +-
.../dolphinscheduler/service/zk/ZKServerTest.java | 12 +-
dolphinscheduler-ui/build/config.js | 6 +-
dolphinscheduler-ui/favicon.ico | Bin 0 -> 4286 bytes
dolphinscheduler-ui/pom.xml | 2 +-
dolphinscheduler-ui/src/js/conf/home/index.js | 2 -
.../src/js/conf/home/pages/dag/_source/dag.js | 22 +-
.../src/js/conf/home/pages/dag/_source/dag.vue | 24 +-
.../home/pages/dag/_source/formModel/formModel.vue | 28 +-
.../dag/_source/formModel/tasks/_source/commcon.js | 8 +
.../pages/dag/_source/formModel/tasks/datax.vue | 81 +
.../home/pages/dag/_source/formModel/tasks/mr.vue | 2 +-
.../pages/dag/_source/formModel/tasks/python.vue | 37 +
.../home/pages/dag/_source/formModel/tasks/sql.vue | 37 +
.../pages/dag/_source/formModel/tasks/sqoop.vue | 74 +-
.../dag/_source/formModel/tasks/sub_process.vue | 7 +-
.../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 40 +-
.../js/conf/home/pages/dag/_source/plugIn/util.js | 4 +-
.../home/pages/dag/_source/startingParam/index.vue | 4 +-
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 9 +-
.../pages/list/_source/createDataSource.vue | 6 +-
.../home/pages/monitor/pages/servers/master.vue | 2 +-
.../home/pages/monitor/pages/servers/worker.vue | 2 +-
.../pages/definition/pages/list/_source/list.vue | 9 +-
.../pages/definition/pages/list/_source/timing.vue | 18 +-
.../projects/pages/definition/pages/list/index.vue | 3 +
.../pages/instance/pages/list/_source/list.vue | 24 +-
.../projects/pages/instance/pages/list/index.vue | 3 +
.../projects/pages/taskInstance/_source/list.vue | 2 +-
.../pages/projects/pages/taskInstance/index.vue | 7 +-
.../pages/file/pages/list/_source/rename.vue | 2 +-
.../pages/udf/pages/function/_source/createUdf.vue | 5 +
.../pages/udf/pages/resource/_source/rename.vue | 2 +-
.../security/pages/users/_source/createUser.vue | 7 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../js/module/components/fileUpdate/udfUpdate.vue | 6 +-
.../src/js/module/i18n/locale/en_US.js | 11 +-
.../src/js/module/i18n/locale/zh_CN.js | 9 +-
dolphinscheduler-ui/src/lib/external/email.js | 2 +-
.../src/sass/common/_animation.scss | 3658 --------------------
dolphinscheduler-ui/src/sass/common/index.scss | 1 -
dolphinscheduler-ui/src/view/home/index.html | 2 +-
dolphinscheduler-ui/src/view/login/index.html | 2 +-
licenses/LICENSE-mybatis.txt | 13 +
pom.xml | 44 +-
script/scp-hosts.sh | 20 +-
script/start-all.sh | 16 +-
script/stop-all.sh | 16 +-
sql/dolphinscheduler-postgre.sql | 7 +-
sql/dolphinscheduler_mysql.sql | 2 +-
sql/h2.mv.db | Bin 110592 -> 0 bytes
.../postgresql/dolphinscheduler_dml.sql | 18 -
.../mysql/dolphinscheduler_ddl.sql | 166 +-
.../mysql/dolphinscheduler_dml.sql | 8 +-
.../postgresql/dolphinscheduler_ddl.sql | 173 +-
.../postgresql/dolphinscheduler_dml.sql | 24 +
tools/dependencies/known-dependencies.txt | 2 +-
220 files changed, 3637 insertions(+), 8628 deletions(-)