This is an automated email from the ASF dual-hosted git repository.
journey pushed a change to branch dailidong-patch-1-1
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from df220c9 Update README.md
add f1d8c15 Add docker-compose.yml
add 7eecfe4 Modify docker-compose and kubernetes config
add 9f32f2d #2499 bug fix (#2527)
add 7aab801 Merge branch 'dev' into docker-compose-dev
add 1185cda update version 2.0.0 backup to 1.3.0 (#2531)
add f38e076 Merge branch 'dev' into docker-compose-dev
add e13c08d Merge pull request #2522 from liwenhe1993/docker-compose-dev
add c50ad12 Add query result set limit. (#2459)
add e6dec8d fix #2442 when the resource name contains '$',need translate
it to '\$' (#2524)
add 4f9d8ca Use docker-compose for deployment . Failed to execute python
script (#2539)
add 03d0f27 Merge branch 'dev' into dailidong-patch-1-1
No new revisions were added by this update.
Summary of changes:
.../DOLPHIN/{2.0.0 => 1.3.0}/alerts.json | 8 +-
.../configuration/dolphin-alert.xml | 0
.../configuration/dolphin-application-api.xml | 0
.../configuration/dolphin-common.xml | 0
.../configuration/dolphin-datasource.xml | 0
.../{2.0.0 => 1.3.0}/configuration/dolphin-env.xml | 0
.../configuration/dolphin-master.xml | 0
.../configuration/dolphin-quartz.xml | 0
.../configuration/dolphin-worker.xml | 0
.../configuration/dolphin-zookeeper.xml | 0
.../DOLPHIN/{1.2.1 => 1.3.0}/metainfo.xml | 4 +-
.../alerts/alert_dolphin_scheduler_status.py | 0
.../package/scripts/dolphin_alert_service.py | 0
.../package/scripts/dolphin_api_service.py | 0
.../package/scripts/dolphin_env.py | 0
.../package/scripts/dolphin_logger_service.py | 0
.../package/scripts/dolphin_master_service.py | 0
.../package/scripts/dolphin_worker_service.py | 0
.../{2.0.0 => 1.3.0}/package/scripts/params.py | 0
.../package/scripts/service_check.py | 0
.../package/scripts/status_params.py | 0
.../package/templates/alert.properties.j2 | 0
.../templates/application-api.properties.j2 | 0
.../package/templates/common.properties.j2 | 0
.../package/templates/datasource.properties.j2 | 0
.../package/templates/dolphin-daemon.sh.j2 | 0
.../package/templates/master.properties.j2 | 0
.../package/templates/quartz.properties.j2 | 0
.../package/templates/worker.properties.j2 | 0
.../package/templates/zookeeper.properties.j2 | 0
.../{2.0.0 => 1.3.0}/quicklinks/quicklinks.json | 0
.../DOLPHIN/{2.0.0 => 1.3.0}/themes/theme.json | 0
ambari_plugin/statcks/DOLPHIN/metainfo.xml | 2 +-
docker/docker-swarm/docker-compose.yml | 233 +++++++++++++++++++++
docker/docker-swarm/docker-stack.yml | 230 ++++++++++++++++++++
.../docker-swarm/dolphinscheduler_env.sh | 6 +-
.../kubernetes}/dolphinscheduler/Chart.yaml | 0
.../kubernetes}/dolphinscheduler/README.md | 0
.../kubernetes}/dolphinscheduler/requirements.yaml | 0
.../dolphinscheduler/templates/NOTES.txt | 0
.../dolphinscheduler/templates/_helpers.tpl | 0
.../configmap-dolphinscheduler-alert.yaml | 0
.../configmap-dolphinscheduler-master.yaml | 0
.../configmap-dolphinscheduler-worker.yaml | 0
.../deployment-dolphinscheduler-alert.yaml | 14 +-
.../templates/deployment-dolphinscheduler-api.yaml | 12 +-
.../deployment-dolphinscheduler-frontend.yaml | 0
.../dolphinscheduler/templates/ingress.yaml | 0
.../templates/pvc-dolphinscheduler-alert.yaml | 0
.../templates/pvc-dolphinscheduler-api.yaml | 0
.../templates/pvc-dolphinscheduler-frontend.yaml | 0
.../templates/secret-external-postgresql.yaml | 0
.../statefulset-dolphinscheduler-master.yaml | 6 +
.../statefulset-dolphinscheduler-worker.yaml | 8 +-
.../templates/svc-dolphinscheduler-api.yaml | 0
.../templates/svc-dolphinscheduler-frontend.yaml | 0
.../svc-dolphinscheduler-master-headless.yaml | 0
.../svc-dolphinscheduler-worker-headless.yaml | 0
.../kubernetes}/dolphinscheduler/values.yaml | 0
dockerfile/Dockerfile | 3 +-
.../conf/dolphinscheduler/conf/worker_logback.xml | 79 -------
.../dolphinscheduler/env/dolphinscheduler_env.sh | 12 +-
.../dolphinscheduler/logback}/logback-alert.xml | 0
.../conf/dolphinscheduler/logback}/logback-api.xml | 0
.../dolphinscheduler/logback}/logback-master.xml | 0
.../dolphinscheduler/logback}/logback-worker.xml | 0
dockerfile/startup.sh | 23 +-
.../api/service/ResourcesService.java | 37 ++--
.../api/service/ResourcesServiceTest.java | 43 ++--
.../server/worker/task/sql/SqlTask.java | 12 +-
.../service/process/ProcessService.java | 4 +
71 files changed, 594 insertions(+), 142 deletions(-)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 => 1.3.0}/alerts.json (94%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-alert.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-application-api.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-common.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-datasource.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-env.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-master.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-quartz.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-worker.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/configuration/dolphin-zookeeper.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.2.1 => 1.3.0}/metainfo.xml (99%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/alerts/alert_dolphin_scheduler_status.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/dolphin_alert_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/dolphin_api_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/dolphin_env.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/dolphin_logger_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/dolphin_master_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/dolphin_worker_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/params.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/service_check.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/scripts/status_params.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/alert.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/application-api.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/common.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/datasource.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/dolphin-daemon.sh.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/master.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/quartz.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/worker.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/package/templates/zookeeper.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 =>
1.3.0}/quicklinks/quicklinks.json (100%)
copy ambari_plugin/common-services/DOLPHIN/{2.0.0 => 1.3.0}/themes/theme.json
(100%)
create mode 100644 docker/docker-swarm/docker-compose.yml
create mode 100644 docker/docker-swarm/docker-stack.yml
copy
ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/alert.properties.j2
=> docker/docker-swarm/dolphinscheduler_env.sh (85%)
rename {kubernetes => docker/kubernetes}/dolphinscheduler/Chart.yaml (100%)
rename {kubernetes => docker/kubernetes}/dolphinscheduler/README.md (100%)
rename {kubernetes => docker/kubernetes}/dolphinscheduler/requirements.yaml
(100%)
rename {kubernetes => docker/kubernetes}/dolphinscheduler/templates/NOTES.txt
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/_helpers.tpl (100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
(96%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
(94%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/ingress.yaml (100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/pvc-dolphinscheduler-alert.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/pvc-dolphinscheduler-api.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/pvc-dolphinscheduler-frontend.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/secret-external-postgresql.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
(97%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
(97%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/svc-dolphinscheduler-frontend.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/svc-dolphinscheduler-master-headless.yaml
(100%)
rename {kubernetes =>
docker/kubernetes}/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
(100%)
rename {kubernetes => docker/kubernetes}/dolphinscheduler/values.yaml (100%)
delete mode 100644 dockerfile/conf/dolphinscheduler/conf/worker_logback.xml
copy {dolphinscheduler-alert/src/main/resources =>
dockerfile/conf/dolphinscheduler/logback}/logback-alert.xml (100%)
copy {dolphinscheduler-api/src/main/resources =>
dockerfile/conf/dolphinscheduler/logback}/logback-api.xml (100%)
copy {dolphinscheduler-server/src/main/resources =>
dockerfile/conf/dolphinscheduler/logback}/logback-master.xml (100%)
copy {dolphinscheduler-server/src/main/resources =>
dockerfile/conf/dolphinscheduler/logback}/logback-worker.xml (100%)
