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/10 03:55:40 UTC
[incubator-dolphinscheduler] branch dev-merge updated (2749c7e ->
1904a70)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch dev-merge
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 2749c7e add alert manage testCase and optimize test case execution order (#2941)
add 3a91070 Merge pull request #12 from apache/dev
add e988d02 add unique key for t_ds_process_definition
add 6f09935 add unique key for t_ds_process_definition
add 1f3625f update filename
add d9efc6a Update dolphinscheduler_ddl.sql
add 4b98d4a Delete dolphinscheduler_ddl.sql
add 7cb387a Delete dolphinscheduler_ddl.sql
add 80a4a44 modify soft_version 1.2.2 to 1.3.0
add 8583b60 Repair worklist cannot be deleted
add 050dae7 update schema version (#2657)
add 231d21e Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add d54aab5 fix bug: sub worker flow in complement data would run start date (#2581) (#2656)
add d58affa Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 5299f39 Merge pull request #2655 from break60/dev-1.3.0
add 5a23b62 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add f0c9e95 Fix conditions node save exception
add 36786aa Merge pull request #2660 from break60/dev-1.3.0
add 7c27440 script variable has "processDefinitionId" is error #2664 (#2666)
add 6b0d116 Merge pull request #15 from apache/dev-1.3.0
add 8121cee add unique key for t_ds_process_definition
add 028903b add unique key for t_ds_process_definition
add 0104517 Update dolphinscheduler_ddl.sql
add 96a4bef Merge pull request #2671 from simon824/dev-1.3.0
add d37e843 Modify the alert log file
add bae4daa Merge pull request #2672 from xingchun-chen/dev-1.3.0
add 83ede10 blank in eamil and left font align #2648 (#2673)
add 3c014c5 fix zookeeper health check and merge volumes into logs volume (#2674)
add d994718 [bug fix] some bugs from 1.2.0 to 1.3.0 (#2676)
add 06c4ddf add worker group config (#2681)
add 443a6d1 delete log files while deleting process instances #2463 (#2693)
add da4863c Merge pull request #16 from apache/dev-1.3.0
add e35e4c0 migrate docker composer and move dockerfile dir to docker/build
add 39a281c ut docker
add c1215ad alter dockerfile to docker/build dir
add 9052dad delete docker-compose old
add 27221d7 delete dockerfile zk
add 31d05e7 delete dockerfile zk
add 0d45372 delete dockerfile zk
add 29a353e Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml (#2692)
add b9bc052 merge from dev1.3.0
add 247830a Merge pull request #2683 from khadgarmage/feature/docker_for_release
add 689c216 add LoggerServerTest UT (#2713)
add f4583d7 add UT (#2717)
add f26d2a7 fix worker group config no effect (#2719)
add 83006e9 Merge pull request #17 from apache/dev-1.3.0
add 58163ec Merge pull request #2698 from simon824/dev-1.3.0
add 5b98750 conditions The task node adds a background color to distinguish successful and failed connections
add e765d07 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 837197c Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 2c0b7f0 Merge pull request #2712 from break60/dev-1.3.0
add f164445 Conditional judgment adds text
add 78bd579 fix
add c08fa12 Merge pull request #2721 from break60/dev-1.3.0
add f52bad5 fix #2449:It's should successful to cancel authorize a resource of a user if all the online process definitions created by this user didn't use this resource. (#2725)
add af458a4 Underline the list of workflow operations
add 1c214fa Merge pull request #2737 from break60/dev-1.3.0
add 7010bb2 Modify HDFS/S3 path (#2736)
add d588d62 Modify ip configuration
add ff1f5fe Merge pull request #2740 from break60/dev-1.3.0
add 63ce143 set worker group (#2743)
add 60f8eb2 fix #2598::allow to update resource suffix,but if it is authorized to other users,it is not allowed (#2732)
add 2700f8d Update known-dependencies.txt
add b51c999 update worker group config (#2746)
add 9ffcd82 remove codehaus janino jar (#2742)
add a9da86a [bug fix] fix bug:2634:Process shows success,when the task of the process is killed in the terminal (#2731)
add be3e761 Update known-dependencies.txt (#2748)
add 8cb4cd2 fix getWorkers bug on RunConfig (#2747)
add 2330cc8 master select worker filter high load worker #2704 (#2733)
add 7ef3bb2 Fix rename check parameter
add 0e64945 fix
add 911053e fix 2598:change getId to getUserId (#2757)
add 448d9d2 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add f03dc47 Merge pull request #2756 from break60/dev-1.3.0
add 86f4276 Fix MySQL autoDeserialize bug (#2728)
add aa5e2cc Fix workflow definition history node data cannot be opened
add 34c292b fix
add cf4fca1 Merge pull request #2760 from break60/dev-1.3.0
add 8c7bc82 delete normalize
add da53304 update e2e chrome version (#2775)
add 170c7e6 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 6550d38 Merge pull request #2765 from break60/dev-1.3.0
add 9bdd36d Modify the background color of conditions task node connection
add 7d2441f Merge pull request #2776 from break60/dev-1.3.0
add 7a05c00 [BUF FIX]fix: the master would be blocked when worker group not exists (#2764)
add 184d64e [BUG FIX] fix bug: dependent task failed when conditions task exists (#2768)
add cfd8323 Hourly dependency configuration， 'currentHour' and 'last24Hours' (#2696)
add 6d0375e fix sql task bug #2739 (#2741)
add e94b02f Worker group adds check
add e83237f fix
add 05a0d38 Worker group adds check (#2787)
add 51df429 add not worker log and remove worker invalid property (#2784)
add cada877 Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory (#2786)
add 354439f Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 8951b29 fixed #2788 resolve the bug #2788 (#2789)
add 3d857bb [BUG FIX] fix bug:cannot pause work flow when task state is "submit success" (#2783)
add 396b171 fix bug:#2735 (#2770)
add 0355dfc Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 06ce6fb Modify startup parameter worker group value
add 20efcd7 add DolphinScheduler slack channel
add df220c9 Update README.md
add 03d0f27 Merge branch 'dev' into dailidong-patch-1-1
add b5c18c2 Merge branch 'dev' into dailidong-patch-1-1
add d8d9e83 Merge branch 'dailidong-patch-1-1' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 0130da2 Fix [Bug] process definition json worker group convert #2794 (#2795)
add 3e297bf [BUG FIX]fix bug: Restart the worker service again, the previously submitted successful tasks are not executed bug (#2800)
add 15504bd delete unnecessary configuration items (#2803)
add e4df413 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0
add 4f0b9b5 Merge pull request #2793 from break60/dev-1.3.0
add 470bd59 rename worker_group_id to worker_group and set the value of worker_group_name (#2801)
add d0fbfea process definition json worker group convert #2794 (#2809)
add 7eb7efb compatible old version host not port delete log file (#2811)
add 9994878 Added instructions for ambari to add and remove Dolphin Schdumer components on nodes (#2806)
add 5b633cf fix oracle connect failure (#2812)
add d4ef229 Modify process group workerGroup value display and filter child node duplicate values
add 44b473c Merge pull request #2814 from break60/dev-1.3.0
add 1ba802c Repair process definition bulk delete function
add ee02e55 Merge pull request #2823 from break60/dev-1.3.0
add 1caac70 [bug fix]fix bug: After the master is fault-tolerant, it cannot resume operation (#2813)
add 92b915e dag download does not refresh, modify the task instance operation width value
add e4a616c fix
add b1e8bec Merge pull request #2826 from break60/dev-1.3.0
add fadb69b When update the data source,the host and port show error (#2821)
add 2c6aa57 when init workflow, the tenantId linked by the tenantId of user
add fa9706f Merge pull request #2825 from Eights-Li/dev-1.3.0
add 198cf3d Fix ORACLE service name value display
add a405bbe Merge pull request #2829 from break60/dev-1.3.0
add feb169e Add tips for download workflow
add ce405dd fix
add f25069b Merge pull request #2831 from break60/dev-1.3.0
add d67436f [bug fix] fix: The workflow is fault-tolerant and 2 task instances are generated (#2833)
add 12dc18b add maven Xmx to 5g
add 68bc597 fix bug: send task result to master until success. (#2839)
add 6f6554a Fix errors when running on win10 (#2842)
add ef4c1e7 add source license full text into source license (#2840)
add a1576d1 Fix abnormal display of regular worker parameters
add c2fbd6a Merge pull request #2843 from break60/dev-1.3.0
add 28e28ca fix table not exist when init db metadata (#2838)
add 2d760cd change notice copyright date from 2019 to 2019-2020 (#2847)
add 009fd01 fix [BUG] TaskExecutionContextCacheManagerImpl Do not execute removeByTaskInstanceId #2745 (#2754)
add 6886ed5 fix table T_DS_ALERT (#2854)
add b0fd387 mr resource display and create user username length cannot be less than 3
add 8f25837 fix
add 2183e7e fix
add 098db69 fix
add ecb4df4 fix
add 5922bcf fix
add 91cb709 Merge pull request #2852 from break60/dev-1.3.0
add 3cbe865 modify t_ds_task_instance app_link change sql (#2861)
add 41e4986 change max length of user name to 39 (#2856)
add 6723454 copy resources need get top directory first (#2866)
add 31dca43 fix #2860:copy files and create empty directory (#2876)
add 4441d91 Fix bug:If user didn't set the value of tenant,release process definition fail (#2885)
add 3e7dc7d merge method updateuser if and fix bug#2892
add ae9afcf Merge pull request #2898 from 597365581/patch-6
add b5eb9fe fix bug: sqoop mysql import params error (#2896)
add e8d9f5c Fixed selection of tenant value and defalut changed to lower case
add dd7513d Merge pull request #2902 from break60/dev-1.3.0
add 3f731f7 update how to build and remove docs link (#2906)
add 8681036 Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908)
add 0de8e58 fix create table sql exception (#2912)
add 5c9b080 fix #2910 master server will show exception for some time when it restart (#2913)
add 7c9f596 Fixbug datax task (#2909)
add 422fe51 [license] add license and notice (#2916)
add 186ba3b fix oom when no master is active in dev-1.3.0 (#2918)
add 464405f Python, sql, sqoop,datax task node editor adds zoom function #2929 (#2933)
new 1904a70 change 1.3.0 to 1.3.0-snapshot
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:
.github/workflows/ci_e2e.yml | 2 +-
.github/workflows/ci_ut.yml | 2 +-
LICENSE | 16 +
NOTICE | 2 +-
README.md | 17 +-
README_zh_CN.md | 17 +-
ambari_plugin/README.md | 97 +++-
.../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 -
.../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 | 37 +-
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 | 64 ++-
.../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 +
.../common/utils/ParameterUtils.java | 17 +-
.../dolphinscheduler/common/utils/ResInfo.java | 8 +-
.../common/utils/ScriptRunner.java | 34 +-
.../common/utils/dependent/DependentDateUtils.java | 27 +
.../src/main/resources/common.properties | 30 +-
.../common/shell/ShellExecutorTest.java | 49 +-
.../common/utils/DependentUtilsTest.java | 40 ++
dolphinscheduler-dao/pom.xml | 2 +-
.../dao/datasource/BaseDataSource.java | 13 +-
.../dao/datasource/MySQLDataSource.java | 47 ++
.../dao/datasource/OracleDataSource.java | 25 +-
.../dolphinscheduler/dao/entity/ProcessData.java | 10 +
.../dolphinscheduler/dao/entity/WorkerGroup.java | 3 -
.../dao/mapper/ProcessDefinitionMapper.java | 7 +
.../dao/upgrade/DolphinSchedulerManager.java | 7 +-
.../dao/upgrade/ProcessDefinitionDao.java | 92 ++++
.../dolphinscheduler/dao/upgrade/UpgradeDao.java | 54 +-
.../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/mapper/ProcessDefinitionMapperTest.java | 27 +-
.../dao/upgrade/ProcessDefinitionDaoTest.java | 65 +++
.../dao/upgrade/UpgradeDaoTest.java | 25 +-
.../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-commons-lang.txt | 202 --------
...SE-aspectjweaver.txt => LICENSE-core-3.1.1.txt} | 18 +-
...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 -
...sdk-java.txt => LICENSE-jsp-api-2.1-6.1.14.txt} | 26 +-
...s-sdk-java.txt => LICENSE-log4j-api-2.11.2.txt} | 26 +-
...NSE-log4j.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-plugin-api/pom.xml | 2 +-
dolphinscheduler-remote/pom.xml | 2 +-
.../remote/NettyRemotingClient.java | 2 +-
.../remote/command/CommandType.java | 2 +-
...mmand.java => RemoveTaskLogRequestCommand.java} | 10 +-
...mand.java => RemoveTaskLogResponseCommand.java} | 27 +-
.../remote/RemoveTaskLogRequestCommandTest.java} | 26 +-
.../remote/RemoveTaskLogResponseCommandTest.java} | 25 +-
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 | 59 ++-
.../server/master/dispatch/ExecutorDispatcher.java | 5 +-
.../dispatch/host/LowerWeightHostManager.java | 27 +-
.../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 | 30 +-
.../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 | 54 +-
.../server/worker/task/shell/ShellTask.java | 2 +-
.../server/worker/task/sql/SqlTask.java | 2 +-
.../generator/sources/MysqlSourceGenerator.java | 18 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 5 +-
.../src/main/resources/config/install_config.conf | 30 +-
.../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 | 4 +-
.../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 | 11 +-
dolphinscheduler-service/pom.xml | 24 +-
.../service/log/LogClientService.java | 29 ++
.../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/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 | 38 +-
.../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/resource/_source/rename.vue | 2 +-
.../security/pages/users/_source/createUser.vue | 7 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../src/js/module/i18n/locale/en_US.js | 10 +-
.../src/js/module/i18n/locale/zh_CN.js | 12 +-
licenses/LICENSE-mybatis.txt | 13 +
pom.xml | 10 +-
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 -
202 files changed, 3160 insertions(+), 5140 deletions(-)
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/ProcessDefinitionDao.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/WorkerGroupDao.java
delete mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSourceTest.java
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/upgrade/ProcessDefinitionDaoTest.java
copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java => dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/upgrade/UpgradeDaoTest.java (61%)
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/upgrade/WokrerGrouopDaoTest.java
create mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-ant-1.6.5.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-commons-el.txt
rename dolphinscheduler-dist/release-docs/licenses/{LICENSE-curator-framework.txt => LICENSE-commons-lang-2.6.txt} (100%)
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-commons-lang.txt
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-aspectjweaver.txt => LICENSE-core-3.1.1.txt} (99%)
rename dolphinscheduler-dist/release-docs/licenses/{LICENSE-commons-lang3.txt => LICENSE-curator-framwork.txt} (100%)
mode change 100644 => 100755
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-freemarker.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc-context.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc-core.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc-netty.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc-protobuf-little.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc-protobuf.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc-stub.txt
create mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-h2-1.4.200.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-instrumentation-api.txt
mode change 100644 => 100755 dolphinscheduler-dist/release-docs/licenses/LICENSE-jackson-annotations.txt
mode change 100644 => 100755 dolphinscheduler-dist/release-docs/licenses/LICENSE-jackson-core.txt
mode change 100644 => 100755 dolphinscheduler-dist/release-docs/licenses/LICENSE-jackson-databind.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-jasper-compiler.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-jasper-runtime.txt
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-aws-sdk-java.txt => LICENSE-jsp-api-2.1-6.1.14.txt} (72%)
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-aws-sdk-java.txt => LICENSE-log4j-api-2.11.2.txt} (72%)
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-log4j.txt => LICENSE-log4j-core-2.11.2.txt} (99%)
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-buffer.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-code-http.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-codec-http2.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-codec-socks.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-codec.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-common.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-handler-proxy.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-handler.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-resolver.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-netty-transport.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-opencensus-api.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-opencensus-contrib-grpc-metrics.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-proto-google-common-protos.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-protobuf-java-util.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-normalize
copy dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/{ViewLogRequestCommand.java => RemoveTaskLogRequestCommand.java} (85%)
copy dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/{ViewLogResponseCommand.java => RemoveTaskLogResponseCommand.java} (73%)
copy dolphinscheduler-remote/src/{main/java/org/apache/dolphinscheduler/remote/processor/NettyRequestProcessor.java => test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogRequestCommandTest.java} (57%)
copy dolphinscheduler-remote/src/{main/java/org/apache/dolphinscheduler/remote/processor/NettyRequestProcessor.java => test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogResponseCommandTest.java} (60%)
create mode 100644 dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/HeartBeatTask.java
create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
create mode 100644 licenses/LICENSE-mybatis.txt
delete mode 100644 sql/h2.mv.db
delete mode 100644 sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_dml.sql
rename sql/upgrade/{1.2.2_schema => 1.3.0_schema}/mysql/dolphinscheduler_ddl.sql (58%)
rename sql/upgrade/{1.2.2_schema => 1.3.0_schema}/mysql/dolphinscheduler_dml.sql (51%)
rename sql/upgrade/{1.2.2_schema => 1.3.0_schema}/postgresql/dolphinscheduler_ddl.sql (59%)
create mode 100644 sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_dml.sql
[incubator-dolphinscheduler] 01/01: change 1.3.0 to 1.3.0-snapshot
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch dev-merge
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 1904a7022a38ff9bc8fbe42f1e8e9c4547916fd6
Merge: 2749c7e 464405f
Author: lenboo <ba...@analysys.com.cn>
AuthorDate: Wed Jun 10 11:42:15 2020 +0800
change 1.3.0 to 1.3.0-snapshot
.github/workflows/ci_e2e.yml | 2 +-
.github/workflows/ci_ut.yml | 2 +-
LICENSE | 16 +
NOTICE | 2 +-
README.md | 17 +-
README_zh_CN.md | 17 +-
ambari_plugin/README.md | 97 +++-
.../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 -
.../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 | 37 +-
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 | 64 ++-
.../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 +
.../common/utils/ParameterUtils.java | 17 +-
.../dolphinscheduler/common/utils/ResInfo.java | 8 +-
.../common/utils/ScriptRunner.java | 34 +-
.../common/utils/dependent/DependentDateUtils.java | 27 +
.../src/main/resources/common.properties | 30 +-
.../common/shell/ShellExecutorTest.java | 49 +-
.../common/utils/DependentUtilsTest.java | 40 ++
dolphinscheduler-dao/pom.xml | 2 +-
.../dao/datasource/BaseDataSource.java | 13 +-
.../dao/datasource/MySQLDataSource.java | 47 ++
.../dao/datasource/OracleDataSource.java | 25 +-
.../dolphinscheduler/dao/entity/ProcessData.java | 10 +
.../dolphinscheduler/dao/entity/WorkerGroup.java | 3 -
.../dao/mapper/ProcessDefinitionMapper.java | 7 +
.../dao/upgrade/DolphinSchedulerManager.java | 7 +-
.../dao/upgrade/ProcessDefinitionDao.java | 92 ++++
.../dolphinscheduler/dao/upgrade/UpgradeDao.java | 54 +-
.../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/mapper/ProcessDefinitionMapperTest.java | 27 +-
.../dao/upgrade/ProcessDefinitionDaoTest.java | 65 +++
.../dao/upgrade/UpgradeDaoTest.java | 24 +-
.../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-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 | 24 +-
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 | 59 ++-
.../server/master/dispatch/ExecutorDispatcher.java | 5 +-
.../dispatch/host/LowerWeightHostManager.java | 27 +-
.../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 | 30 +-
.../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 | 54 +-
.../server/worker/task/shell/ShellTask.java | 2 +-
.../server/worker/task/sql/SqlTask.java | 2 +-
.../generator/sources/MysqlSourceGenerator.java | 18 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 5 +-
.../src/main/resources/config/install_config.conf | 30 +-
.../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 | 4 +-
.../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 | 11 +-
dolphinscheduler-service/pom.xml | 24 +-
.../service/log/LogClientService.java | 29 ++
.../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/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 | 38 +-
.../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/resource/_source/rename.vue | 2 +-
.../security/pages/users/_source/createUser.vue | 7 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../src/js/module/i18n/locale/en_US.js | 10 +-
.../src/js/module/i18n/locale/zh_CN.js | 12 +-
licenses/LICENSE-mybatis.txt | 13 +
pom.xml | 10 +-
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
.../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 -
200 files changed, 3441 insertions(+), 4838 deletions(-)
diff --cc dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java
index ec47a1e,540b1a9..465d9bf
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java
@@@ -156,24 -156,11 +156,28 @@@ public class Constants
public static final String ENTERPRISE_WECHAT_AGENT_ID = "enterprise.wechat.agent.id";
public static final String ENTERPRISE_WECHAT_USERS = "enterprise.wechat.users";
+
+
+ public static final String DINGTALK_WEBHOOK = "dingtalk.webhook";
+
+ public static final String DINGTALK_KEYWORD = "dingtalk.keyword";
+
+ public static final String DINGTALK_PROXY_ENABLE = "dingtalk.isEnableProxy";
+
+ public static final String DINGTALK_PROXY = "dingtalk.proxy";
+
+ public static final String DINGTALK_PORT = "dingtalk.port";
+
+ public static final String DINGTALK_USER = "dingtalk.user";
+
+ public static final String DINGTALK_PASSWORD = "dingtalk.password";
+
+ public static final String DINGTALK_ENABLE = "dingtalk.isEnable";
+ public static final String HTML_HEADER_PREFIX = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title>dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type=\"text/css\">table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}table th {border-width: 1px;padding: 8px;borde [...]
+
+ public static final String TABLE_BODY_HTML_TAIL = "</table></body></html>";
+
/**
* plugin config
*/
diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
index bb31733,8d79c8e..09d4824
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
@@@ -306,16 -306,12 +310,13 @@@ public class UsersService extends BaseS
user.setEmail(email);
}
- if (StringUtils.isNotEmpty(phone)) {
- if (!CheckUtils.checkPhone(phone)){
- putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
- return result;
- }
- user.setPhone(phone);
+ if (StringUtils.isNotEmpty(phone) && !CheckUtils.checkPhone(phone)) {
+ putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
+ return result;
}
-
+ user.setPhone(phone);
user.setQueue(queue);
+ user.setState(state);
Date now = new Date();
user.setUpdateTime(now);
diff --cc dolphinscheduler-common/src/main/resources/common.properties
index 0cc118f,923f02a..089b07d
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@@ -42,25 -42,23 +42,25 @@@ login.user.keytab.path=/opt/hdfs.headle
# if resource.storage.type=HDFS, the user need to have permission to create directories under the HDFS root path
hdfs.root.user=hdfs
-# if resource.storage.type=S3，the value like: s3a://dolphinscheduler ; if resource.storage.type=HDFS, When namenode HA is enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir
+# if resource.storage.type=S3,the value like: s3a://dolphinscheduler ; if resource.storage.type=HDFS, When namenode HA is enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir
fs.defaultFS=hdfs://mycluster:8020
- # if resource.storage.type=S3,s3 endpoint
- #fs.s3a.endpoint=http://192.168.199.91:9010
+ # if resource.storage.type=S3，s3 endpoint
+ fs.s3a.endpoint=http://192.168.xx.xx:9010
- # if resource.storage.type=S3,s3 access key
- #fs.s3a.access.key=A3DXS30FO22544RE
+ # if resource.storage.type=S3，s3 access key
+ fs.s3a.access.key=A3DXS30FO22544RE
- # if resource.storage.type=S3,s3 secret key
- #fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
+ # if resource.storage.type=S3，s3 secret key
+ fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
# if not use hadoop resourcemanager, please keep default value; if resourcemanager HA enable, please type the HA ips ; if resourcemanager is single, make this value empty
yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
- # If resourcemanager HA enable or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ark1 to actual resourcemanager hostname.
- yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
+ # if resourcemanager HA enable or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ds1 to actual resourcemanager hostname.
+ yarn.application.status.address=http://ds1:8088/ws/v1/cluster/apps/%s
+# job history status url when application number threshold is reached(default 10000,maybe it was set to 1000)
- yarn.job.history.status.address=http://ark1:19888/ws/v1/history/mapreduce/jobs/%s
++yarn.job.history.status.address=http://ds1:19888/ws/v1/history/mapreduce/jobs/%s
# system env path
#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
diff --cc dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 026b96b,def4c1a..a3d691c
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@@ -588,9 -590,10 +590,13 @@@ export default
'Some Columns': 'Some Columns',
'Branch flow': 'Branch flow',
'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow',
- 'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required',
+ 'Successful branch flow and failed branch flow are required': 'conditions node Successful and failed branch flow are required',
'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
'Please delete all non-existent resources': 'Please delete all non-existent resources',
+ 'Enable': 'Enable',
- 'Disable': 'Disable'
++ 'Disable': 'Disable',
++ 'Please delete all non-existent resources': 'Please delete all non-existent resources',
+ 'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!',
+ 'Please confirm whether the workflow has been saved before downloading': 'Please confirm whether the workflow has been saved before downloading',
+ 'User name length is between 3 and 39': 'User name length is between 3 and 39'
}
diff --cc dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 39f237c,add8601..af384cc
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@@ -588,9 -590,10 +590,13 @@@ export default
'Some Columns': '选择列',
'Branch flow': '分支流转',
'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点',
- 'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填',
+ 'Successful branch flow and failed branch flow are required': 'conditions节点成功和失败分支流转必填',
'Unauthorized or deleted resources': '未授权或已删除资源',
'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
+ 'Enable': '启用',
- 'Disable': '停用'
++ 'Disable': '停用',
++ 'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
+ 'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在，请选择正确的Worker分组！',
+ 'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存',
+ 'User name length is between 3 and 39': '用户名长度在3～39之间'
}
diff --cc sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_ddl.sql
index 87d06e9,a188bfe..40e7a3f
--- a/sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_ddl.sql
@@@ -354,27 -274,6 +274,27 @@@ CREATE PROCEDURE uc_dolphin_T_t_ds_proc
d//
delimiter ;
- CALL dc_dolphin_T_t_ds_error_command_D_worker_group_id;
- DROP PROCEDURE dc_dolphin_T_t_ds_error_command_D_worker_group_id;
+ CALL uc_dolphin_T_t_ds_process_definition_A_process_definition_unique;
+ DROP PROCEDURE uc_dolphin_T_t_ds_process_definition_A_process_definition_unique;
+-- ac_dolphin_T_t_ds_user_A_state
+drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_user_A_state;
+delimiter d//
+CREATE PROCEDURE ac_dolphin_T_t_ds_user_A_state()
+ BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_user'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME ='state')
+ THEN
+ ALTER TABLE t_ds_user ADD `state` int(1) DEFAULT 1 COMMENT 'state 0:disable 1:enable';
+ END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_dolphin_T_t_ds_user_A_state;
+DROP PROCEDURE ac_dolphin_T_t_ds_user_A_state;
+
+
diff --cc sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_ddl.sql
index b3f5436,506ae35..7ea4a34
--- a/sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_ddl.sql
@@@ -359,28 -277,9 +277,29 @@@ BEGI
END;
$$ LANGUAGE plpgsql;
d//
+
delimiter ;
- select dc_dolphin_T_t_ds_error_command_D_worker_group_id();
- DROP FUNCTION dc_dolphin_T_t_ds_error_command_D_worker_group_id();
+ SELECT uc_dolphin_T_t_ds_process_definition_A_process_definition_unique();
+ DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_process_definition_A_process_definition_unique();
+-- ac_dolphin_T_t_ds_user_A_state
+delimiter ;
+DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_user_A_state();
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_user_A_state() RETURNS void AS $$
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_CATALOG=current_database()
+ AND TABLE_SCHEMA=current_schema()
+ AND TABLE_NAME='t_ds_user'
+ AND COLUMN_NAME ='state')
+ THEN
+ ALTER TABLE t_ds_user ADD COLUMN state int DEFAULT 1;
+ END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_user_A_state();
+DROP FUNCTION ac_dolphin_T_t_ds_user_A_state();