You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2020/05/06 06:10:51 UTC
[incubator-dolphinscheduler] branch dailidong-patch-1-1 updated
(03d0f27 -> b5c18c2)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a change to branch dailidong-patch-1-1
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 03d0f27 Merge branch 'dev' into dailidong-patch-1-1
add 76b61c1 Fix page display incomplete
add 062a0ff Merge pull request #2549 from break60/dev
add fd79be3 verify whether the filename start with '/' (#2544)
add 7a10008 Increase dataX environment variable, sslTrust default value (#2555)
add a12103b no valid worker group，master can kill task directly (#2541)
add 5666e6b No master don't create command #2571 (#2575)
add 22d4ee9 modify dataX environment variable (#2577)
add 0494703 Fix condition judgment state value
add 16a4d59 fix
add c94748a Merge pull request #2582 from break60/dev
add 9197a68 Work example page list supports scrolling
add d6b5253 fixed bug #2492
add 83051cd Merge remote-tracking branch 'remote/dev' into dev
add 562511a Merge branch 'dev' into dev
add 2bd3a9b Merge branch 'dev' of github.com:muzhongjiang/incubator-dolphinscheduler into dev
add 9421a79 fix bug "Password display in plain text"
add 336a7f3 Merge remote-tracking branch 'remote/dev' into dev
add bcf4a0e Merge branch 'dev' into dev
add bbc1e53 Merge branch 'dev' of github.com:muzhongjiang/incubator-dolphinscheduler into dev
add 5caa6e5 Merge branch 'dev' into dev
add 682fd7b Merge branch 'dev' into dev
add 54fc147 Merge branch 'dev' into dev
add a5e4566 Merge pull request #2556 from muzhongjiang/dev
add 6e7b11b Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add d629d38 Merge pull request #2586 from break60/dev
add c01122b Optimize workflow instance page
add ad90df2 1. add file add README.md2. delete ambari_plugin/common-services/DOLPHIN/2.0.0 (#2546)
add 51bdfcc Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add bb7d50a Merge branch 'dev' into dev
add a7d77ba Merge branch 'dev' of https://github.com/break60/incubator-dolphinscheduler into dev
add 85f3ac1 feat: add plugin management for alert service
add 3c6d813 add license to plugin api pom file
add 906ffa0 resolve code checks
add eefea82 Merge branch 'dev' into dev
add 6e81dd3 Merge pull request #2572 from hgaol/dev
add 6e08b29 Add a script to check the license (#2552)
add a35e4f5 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 0456ea6 Optimize workflow instance page (#2589)
add 227af6e Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 50e4b23 Workflow definition and task instance page add scroll
add 99f2a2b Merge pull request #2600 from break60/dev
add c3353c2 Zookeeper management interface in monitoring center displays abnormal #2547 (#2595)
add b5c18c2 Merge branch 'dev' into dailidong-patch-1-1
No new revisions were added by this update.
Summary of changes:
.github/workflows/ci_backend.yml | 22 +-
.gitignore | 125 +---
ambari_plugin/README.md | 68 +++
.../common-services/DOLPHIN/2.0.0/alerts.json | 164 -----
.../DOLPHIN/2.0.0/configuration/dolphin-alert.xml | 143 -----
.../configuration/dolphin-application-api.xml | 87 ---
.../DOLPHIN/2.0.0/configuration/dolphin-common.xml | 158 -----
.../2.0.0/configuration/dolphin-datasource.xml | 467 ---------------
.../DOLPHIN/2.0.0/configuration/dolphin-env.xml | 123 ----
.../DOLPHIN/2.0.0/configuration/dolphin-master.xml | 88 ---
.../DOLPHIN/2.0.0/configuration/dolphin-quartz.xml | 126 ----
.../DOLPHIN/2.0.0/configuration/dolphin-worker.xml | 76 ---
.../2.0.0/configuration/dolphin-zookeeper.xml | 84 ---
.../common-services/DOLPHIN/2.0.0/metainfo.xml | 137 -----
.../alerts/alert_dolphin_scheduler_status.py | 124 ----
.../2.0.0/package/scripts/dolphin_alert_service.py | 61 --
.../2.0.0/package/scripts/dolphin_api_service.py | 70 ---
.../DOLPHIN/2.0.0/package/scripts/dolphin_env.py | 123 ----
.../package/scripts/dolphin_logger_service.py | 61 --
.../package/scripts/dolphin_master_service.py | 61 --
.../package/scripts/dolphin_worker_service.py | 60 --
.../DOLPHIN/2.0.0/package/scripts/params.py | 154 -----
.../DOLPHIN/2.0.0/package/scripts/service_check.py | 31 -
.../DOLPHIN/2.0.0/package/scripts/status_params.py | 23 -
.../templates/application-api.properties.j2 | 20 -
.../2.0.0/package/templates/common.properties.j2 | 20 -
.../package/templates/datasource.properties.j2 | 20 -
.../2.0.0/package/templates/dolphin-daemon.sh.j2 | 116 ----
.../2.0.0/package/templates/master.properties.j2 | 20 -
.../2.0.0/package/templates/quartz.properties.j2 | 20 -
.../2.0.0/package/templates/worker.properties.j2 | 20 -
.../package/templates/zookeeper.properties.j2 | 20 -
.../DOLPHIN/2.0.0/quicklinks/quicklinks.json | 26 -
.../DOLPHIN/2.0.0/themes/theme.json | 661 ---------------------
docker/docker-compose.yml | 1 +
.../apache/dolphinscheduler/alert/AlertServer.java | 30 +-
.../alert/manager/EmailManager.java | 5 +-
.../alert/manager/EnterpriseWeChatManager.java | 10 +-
.../alert/plugin/EmailAlertPlugin.java | 133 +++++
.../dolphinscheduler/alert/runner/AlertSender.java | 130 ++--
.../dolphinscheduler/alert/utils/Constants.java | 17 +
.../alert/utils/EnterpriseWeChatUtils.java | 17 +-
.../dolphinscheduler/alert/utils/MailUtils.java | 16 +-
.../src/main/resources/alert.properties | 2 +-
.../alert/plugin/EmailAlertPluginTest.java | 80 +++
.../alert/utils/EnterpriseWeChatUtilsTest.java | 13 +-
.../alert/utils/MailUtilsTest.java | 10 +-
.../api/service/ExecutorService.java | 11 +-
.../api/service/SchedulerService.java | 1 +
.../dolphinscheduler/api/utils/ZooKeeperState.java | 14 +-
.../api/utils/ZookeeperMonitor.java | 6 +-
.../api/service/ExecutorService2Test.java | 43 +-
dolphinscheduler-common/pom.xml | 5 +-
.../apache/dolphinscheduler/common/Constants.java | 7 +
.../common/plugin/FilePluginManager.java | 107 ++++
.../common/plugin/PluginClassLoader.java | 154 +++++
.../PluginManager.java} | 20 +-
.../dolphinscheduler/common/utils/HadoopUtils.java | 9 +
.../common/plugin/FilePluginManagerTest.java | 72 +++
.../common/plugin/PluginClassLoaderTest.java | 61 ++
.../common/utils/HadoopUtilsTest.java | 12 +
.../dao/entity/ZookeeperRecord.java | 18 +-
dolphinscheduler-dist/release-docs/LICENSE | 1 -
.../release-docs/licenses/LICENSE-lombok.txt | 19 -
.../pom.xml | 35 +-
.../dolphinscheduler/plugin/api/AlertPlugin.java | 27 +-
.../dolphinscheduler/plugin/model/AlertData.java | 129 ++++
.../dolphinscheduler/plugin/model/AlertInfo.java | 54 +-
.../dolphinscheduler/plugin/model/PluginName.java | 31 +-
.../plugin/spi/AlertPluginProvider.java | 14 +-
.../plugin}/utils/PropertyUtils.java | 136 +++--
.../plugin/model/AlertDataTest.java | 80 +++
.../plugin/model/AlertInfoTest.java | 33 +-
.../plugin/utils/PropertyUtilsTest.java | 83 +++
.../src/test/resources/plugin.properties | 8 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 16 +-
.../server/master/runner/MasterTaskExecThread.java | 46 +-
.../server/worker/task/sql/SqlTask.java | 2 +-
.../src/main/resources/config/install_config.conf | 3 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 262 ++++++++
.../master/runner/MasterTaskExecThreadTest.java | 80 +++
.../server/registry/DependencyConfig.java | 8 +
dolphinscheduler-ui/package.json | 2 +-
.../src/js/conf/home/pages/dag/_source/dag.vue | 7 +
.../_source/formModel/tasks/_source/nodeStatus.vue | 7 +-
.../dag/_source/formModel/tasks/conditions.vue | 9 +-
.../pages/definition/pages/list/_source/list.vue | 24 +-
.../projects/pages/definition/pages/list/index.vue | 81 ++-
.../pages/instance/pages/list/_source/list.vue | 47 +-
.../projects/pages/instance/pages/list/index.vue | 68 ++-
.../projects/pages/taskInstance/_source/list.vue | 30 +-
.../pages/projects/pages/taskInstance/index.vue | 71 ++-
.../pages/resource/pages/file/pages/list/index.vue | 13 +-
.../pages/file/pages/subdirectory/index.vue | 11 +-
.../resource/pages/udf/pages/function/index.vue | 14 +-
.../resource/pages/udf/pages/resource/index.vue | 14 +-
.../pages/udf/pages/subUdfDirectory/index.vue | 11 +-
.../conf/home/pages/security/pages/queue/index.vue | 11 +-
.../home/pages/security/pages/tenement/index.vue | 11 +-
.../security/pages/users/_source/createUser.vue | 2 +-
.../conf/home/pages/security/pages/users/index.vue | 13 +-
.../pages/security/pages/warningGroups/index.vue | 11 +-
.../js/conf/home/pages/user/pages/token/index.vue | 13 +-
dolphinscheduler-ui/src/js/conf/login/App.vue | 1 +
.../components/secondaryMenu/secondaryMenu.vue | 8 +-
.../src/js/module/components/spin/spin.vue | 8 +-
dolphinscheduler-ui/src/sass/conf/home/index.scss | 5 +
pom.xml | 34 +-
script/env/dolphinscheduler_env.sh | 4 +-
tools/dependencies/check-LICENSE.sh | 39 ++
tools/dependencies/known-dependencies.txt | 211 +++++++
111 files changed, 2473 insertions(+), 3957 deletions(-)
create mode 100644 ambari_plugin/README.md
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/alerts.json
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-alert.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-application-api.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-common.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-datasource.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-env.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-master.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-quartz.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-worker.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-zookeeper.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/metainfo.xml
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/alerts/alert_dolphin_scheduler_status.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/dolphin_alert_service.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/dolphin_api_service.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/dolphin_env.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/dolphin_logger_service.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/dolphin_master_service.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/dolphin_worker_service.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/params.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/service_check.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/scripts/status_params.py
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/application-api.properties.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/common.properties.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/datasource.properties.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/dolphin-daemon.sh.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/master.properties.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/quartz.properties.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/worker.properties.j2
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/zookeeper.properties.j2
delete mode 100755 ambari_plugin/common-services/DOLPHIN/2.0.0/quicklinks/quicklinks.json
delete mode 100644 ambari_plugin/common-services/DOLPHIN/2.0.0/themes/theme.json
create mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
create mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoader.java
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/{enums/TaskRecordStatus.java => plugin/PluginManager.java} (73%)
create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/FilePluginManagerTest.java
create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoaderTest.java
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-lombok.txt
copy {dolphinscheduler-remote => dolphinscheduler-plugin-api}/pom.xml (69%)
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java (63%)
create mode 100644 dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/AlertData.java
copy dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/ResourceProcessDefinitionUtilsTest.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/AlertInfo.java (50%)
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java (63%)
copy dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/InvokeCallback.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/spi/AlertPluginProvider.java (76%)
copy {dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin}/utils/PropertyUtils.java (56%)
create mode 100644 dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertDataTest.java
copy dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/ZKServerTest.java => dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java (56%)
create mode 100644 dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtilsTest.java
rename ambari_plugin/common-services/DOLPHIN/2.0.0/package/templates/alert.properties.j2 => dolphinscheduler-plugin-api/src/test/resources/plugin.properties (90%)
create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThreadTest.java
create mode 100755 tools/dependencies/check-LICENSE.sh
create mode 100755 tools/dependencies/known-dependencies.txt