This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a change to branch dev
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 4b502e3 [Improvement-4012][common/remote] Json util code
integration,remove the remote module json util (#4013)
add ad2d9f9 [Draft][Merge][133-dev]133 merge dev (#4031)
No new revisions were added by this update.
Summary of changes:
.gitignore | 128 ++++-
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes
.../DOLPHIN/1.2.1/configuration/dolphin-alert.xml | 144 -----
.../1.2.1/configuration/dolphin-application.xml | 467 ----------------
.../DOLPHIN/1.2.1/configuration/dolphin-quartz.xml | 131 -----
.../1.2.1/package/scripts/dolphin_alert_service.py | 61 ---
.../1.2.1/package/scripts/dolphin_api_service.py | 70 ---
.../DOLPHIN/1.2.1/package/scripts/dolphin_env.py | 121 -----
.../package/scripts/dolphin_logger_service.py | 61 ---
.../package/scripts/dolphin_master_service.py | 61 ---
.../package/scripts/dolphin_worker_service.py | 60 --
.../DOLPHIN/1.2.1/package/scripts/params.py | 150 -----
.../1.2.1/package/templates/dolphin-daemon.j2 | 119 ----
.../DOLPHIN/1.2.1/themes/theme.json | 605 ---------------------
.../DOLPHIN/{1.2.1 => 1.3.3}/alerts.json | 6 +-
.../configuration/dolphin-alert.xml | 0
.../configuration/dolphin-application-api.xml | 0
.../configuration/dolphin-common.xml | 0
.../configuration/dolphin-datasource.xml | 0
.../{1.2.1 => 1.3.3}/configuration/dolphin-env.xml | 0
.../configuration/dolphin-master.xml | 0
.../configuration/dolphin-quartz.xml | 0
.../configuration/dolphin-worker.xml} | 54 +-
.../configuration/dolphin-zookeeper.xml | 0
.../DOLPHIN/{1.2.1 => 1.3.3}/metainfo.xml | 6 +-
.../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
.../{1.3.0 => 1.3.3}/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
.../{1.2.1 => 1.3.3}/quicklinks/quicklinks.json | 0
.../DOLPHIN/{1.3.0 => 1.3.3}/themes/theme.json | 0
.../kubernetes/dolphinscheduler/requirements.yaml | 13 +-
dolphinscheduler-alert/pom.xml | 2 +-
.../alert/plugin/EmailAlertPluginTest.java | 4 +-
dolphinscheduler-api/pom.xml | 2 +-
.../api/controller/AccessTokenController.java | 6 +-
.../api/controller/ResourcesController.java | 47 +-
.../api/controller/UsersController.java | 2 +-
.../api/service/AccessTokenService.java | 7 +-
.../dolphinscheduler/api/service/BaseService.java | 19 +
.../api/service/ResourcesService.java | 181 ++++--
.../api/service/UdfFuncService.java | 20 +-
.../dolphinscheduler/api/service/UsersService.java | 51 +-
.../api/service/impl/AccessTokenServiceImpl.java | 24 +-
.../api/service/impl/LoggerServiceImpl.java | 1 -
.../service/impl/ProcessDefinitionServiceImpl.java | 117 +++-
.../api/service/impl/TenantServiceImpl.java | 20 +
.../src/main/resources/logback-api.xml | 1 -
.../api/service/AccessTokenServiceTest.java | 16 +-
.../api/service/ProcessDefinitionServiceTest.java | 10 +-
.../api/service/ResourcesServiceTest.java | 22 +-
.../api/service/UdfFuncServiceTest.java | 8 +-
.../api/service/UsersServiceTest.java | 10 +-
dolphinscheduler-common/pom.xml | 2 +-
.../enums/{AlertWarnLevel.java => Event.java} | 6 +-
.../common/process/ResourceInfo.java | 2 -
.../common/task/flink/FlinkParameters.java | 1 +
.../common/task/spark/SparkParameters.java | 2 +-
dolphinscheduler-dao/pom.xml | 5 +-
.../dolphinscheduler/dao/entity/Command.java | 2 +
.../dao/mapper/ProcessInstanceMapper.java | 14 +
.../dolphinscheduler/dao/mapper/UdfFuncMapper.java | 7 +
.../dao/upgrade/DolphinSchedulerManager.java | 2 +
.../{WorkerGroupDao.java => ResourceDao.java} | 30 +-
.../dolphinscheduler/dao/upgrade/UpgradeDao.java | 194 +++++--
.../dolphinscheduler/dao/utils/DagHelper.java | 177 ++++--
.../dolphinscheduler/dao/mapper/UdfFuncMapper.xml | 13 +
.../dao/mapper/UdfFuncMapperTest.java | 59 +-
.../dolphinscheduler/dao/utils/DagHelperTest.java | 254 ++++++++-
dolphinscheduler-dist/pom.xml | 2 +-
dolphinscheduler-microbench/pom.xml | 2 +-
dolphinscheduler-plugin-api/pom.xml | 2 +-
dolphinscheduler-remote/pom.xml | 2 +-
.../remote/command/CommandType.java | 10 +
...llRequestCommand.java => DBTaskAckCommand.java} | 38 +-
...uestCommand.java => DBTaskResponseCommand.java} | 36 +-
dolphinscheduler-server/pom.xml | 2 +-
.../{WorkerLogFilter.java => TaskLogAppender.java} | 38 +-
.../dispatch/executor/NettyExecutorManager.java | 79 ++-
.../server/master/processor/TaskAckProcessor.java | 28 +-
.../master/processor/TaskResponseProcessor.java | 30 +-
.../master/processor/queue/TaskResponseEvent.java | 36 +-
.../processor/queue/TaskResponseService.java | 58 +-
.../master/runner/ConditionsTaskExecThread.java | 3 -
.../master/runner/DependentTaskExecThread.java | 4 +
.../master/runner/MasterBaseTaskExecThread.java | 103 +++-
.../server/master/runner/MasterExecThread.java | 191 ++-----
.../server/master/runner/MasterTaskExecThread.java | 32 +-
.../master/runner/SubProcessTaskExecThread.java | 7 +-
.../server/utils/AlertManager.java | 4 +
.../server/utils/DependentExecute.java | 4 +-
.../dolphinscheduler/server/utils/UDFUtils.java | 6 +-
.../server/worker/WorkerServer.java | 11 +
.../server/worker/cache/ResponceCache.java | 94 ++++
.../processor/DBTaskAckProcessor.java} | 42 +-
.../processor/DBTaskResponseProcessor.java} | 40 +-
.../worker/processor/NettyRemoteChannel.java | 6 +
.../worker/processor/TaskCallbackService.java | 36 +-
.../worker/processor/TaskExecuteProcessor.java | 40 +-
.../worker/runner/RetryReportTaskStatusThread.java | 94 ++++
.../server/worker/runner/TaskExecuteThread.java | 14 +-
.../worker/task/AbstractCommandExecutor.java | 115 ++--
.../server/worker/task/AbstractTask.java | 22 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 22 +-
.../src/main/resources/logback-master.xml | 1 -
.../src/main/resources/logback-worker.xml | 1 -
.../server/master/DependentTaskTest.java | 1 +
.../server/master/MasterCommandTest.java | 25 -
.../host/assign/RoundRobinSelectorTest.java | 80 ++-
.../master/processor/TaskAckProcessorTest.java | 24 +-
.../processor/queue/TaskResponseServiceTest.java | 4 +-
.../master/runner/MasterTaskExecThreadTest.java | 3 +-
.../worker/processor/TaskCallbackServiceTest.java | 12 +-
.../worker/runner/TaskExecuteThreadTest.java | 7 +-
dolphinscheduler-service/pom.xml | 2 +-
.../service/process/ProcessService.java | 70 ++-
.../service/zk/ZookeeperCachedOperator.java | 27 +-
.../service/zk/ZookeeperOperator.java | 93 +++-
dolphinscheduler-ui/build/webpack.config.prod.js | 7 +-
dolphinscheduler-ui/pom.xml | 2 +-
.../src/js/conf/home/pages/dag/_source/dag.js | 8 +-
.../conf/home/pages/dag/_source/formModel/log.vue | 23 +-
.../pages/index/_source/processStateCount.vue | 21 +-
.../pages/index/_source/taskCtatusCount.vue | 19 +-
.../projects/pages/taskInstance/_source/list.vue | 1 +
.../resource/pages/file/pages/details/index.vue | 2 +-
.../pages/udf/pages/function/_source/list.vue | 10 +-
.../pages/tenement/_source/createTenement.vue | 3 +-
.../pages/user/pages/token/_source/createToken.vue | 2 +-
.../home/pages/user/pages/token/_source/list.vue | 2 +-
.../src/js/conf/home/store/projects/mutations.js | 6 +
.../src/js/conf/home/store/projects/state.js | 2 +-
.../{fileChildUpdate.vue => fileChildReUpdate.vue} | 68 ++-
.../{resourceChildUpdate.vue => fileReUpload.vue} | 69 ++-
.../src/js/module/i18n/locale/en_US.js | 13 +
.../src/js/module/i18n/locale/zh_CN.js | 11 +-
...kflowDefineData.java => CreateProjectData.java} | 17 +-
.../data/project/CreateWorkflowData.java | 77 +++
...ojectLocator.java => CreateProjectLocator.java} | 14 +-
...fineLocator.java => CreateWorkflowLocator.java} | 48 +-
.../{ProjectPage.java => CreateProjectPage.java} | 36 +-
.../page/project/CreateWorkflowPage.java | 201 +++++++
.../page/security/TenantManagePage.java | 2 +-
.../DeleteProjectTest.java} | 12 +-
.../DeleteTenantTest.java} | 6 +-
.../DeleteUserTest.java} | 6 +-
.../DeleteWorkflowTest.java} | 26 +-
pom.xml | 2 +-
script/dolphinscheduler-daemon.sh | 20 +-
.../mysql/dolphinscheduler_ddl.sql} | 0
.../mysql/dolphinscheduler_dml.sql | 3 +
.../postgresql/dolphinscheduler_ddl.sql} | 0
.../postgresql/dolphinscheduler_dml.sql | 1 +
168 files changed, 2698 insertions(+), 3242 deletions(-)
create mode 100644 .mvn/wrapper/maven-wrapper.jar
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-alert.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-application.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-quartz.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/dolphin_alert_service.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/dolphin_api_service.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/dolphin_env.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/dolphin_logger_service.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/dolphin_master_service.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/dolphin_worker_service.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/dolphin-daemon.j2
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/themes/theme.json
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 => 1.3.3}/alerts.json (95%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/configuration/dolphin-alert.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/configuration/dolphin-application-api.xml (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/configuration/dolphin-common.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/configuration/dolphin-datasource.xml (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/configuration/dolphin-env.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/configuration/dolphin-master.xml (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/configuration/dolphin-quartz.xml (100%)
rename
ambari_plugin/common-services/DOLPHIN/{1.2.1/configuration/dolphin-application-api.xml
=> 1.3.3/configuration/dolphin-worker.xml} (54%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/configuration/dolphin-zookeeper.xml (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 => 1.3.3}/metainfo.xml
(98%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/alerts/alert_dolphin_scheduler_status.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/dolphin_alert_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/dolphin_api_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/dolphin_env.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/dolphin_logger_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/dolphin_master_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/dolphin_worker_service.py (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/scripts/params.py (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/scripts/service_check.py (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/scripts/status_params.py (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/templates/alert.properties.j2 (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/templates/application-api.properties.j2 (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/templates/common.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/templates/datasource.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/templates/dolphin-daemon.sh.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/templates/master.properties.j2 (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/package/templates/quartz.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/templates/worker.properties.j2 (100%)
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 =>
1.3.3}/package/templates/zookeeper.properties.j2 (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.2.1 =>
1.3.3}/quicklinks/quicklinks.json (100%)
mode change 100755 => 100644
copy ambari_plugin/common-services/DOLPHIN/{1.3.0 => 1.3.3}/themes/theme.json
(100%)
rename
ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/application.properties.j2
=> docker/kubernetes/dolphinscheduler/requirements.yaml (76%)
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{AlertWarnLevel.java
=> Event.java} (94%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/{WorkerGroupDao.java
=> ResourceDao.java} (74%)
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{TaskKillRequestCommand.java
=> DBTaskAckCommand.java} (68%)
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{TaskKillRequestCommand.java
=> DBTaskResponseCommand.java} (67%)
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/{WorkerLogFilter.java
=> TaskLogAppender.java} (59%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/cache/ResponceCache.java
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/{master/processor/TaskKillResponseProcessor.java
=> worker/processor/DBTaskAckProcessor.java} (54%)
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/{master/processor/TaskKillResponseProcessor.java
=> worker/processor/DBTaskResponseProcessor.java} (55%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java
copy
dolphinscheduler-ui/src/js/module/components/fileUpdate/{fileChildUpdate.vue =>
fileChildReUpdate.vue} (83%)
copy
dolphinscheduler-ui/src/js/module/components/fileUpdate/{resourceChildUpdate.vue
=> fileReUpload.vue} (83%)
mode change 100755 => 100644
copy
e2e/src/test/java/org/apache/dolphinscheduler/data/project/{WorkflowDefineData.java
=> CreateProjectData.java} (71%)
create mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/data/project/CreateWorkflowData.java
copy
e2e/src/test/java/org/apache/dolphinscheduler/locator/project/{ProjectLocator.java
=> CreateProjectLocator.java} (78%)
copy
e2e/src/test/java/org/apache/dolphinscheduler/locator/project/{WorkflowDefineLocator.java
=> CreateWorkflowLocator.java} (81%)
copy
e2e/src/test/java/org/apache/dolphinscheduler/page/project/{ProjectPage.java =>
CreateProjectPage.java} (60%)
create mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/page/project/CreateWorkflowPage.java
copy
e2e/src/test/java/org/apache/dolphinscheduler/testcase/{testDeleteData/TestDeleteProject.java
=> deleteData/DeleteProjectTest.java} (81%)
copy
e2e/src/test/java/org/apache/dolphinscheduler/testcase/{testDeleteData/TestDeleteTenant.java
=> deleteData/DeleteTenantTest.java} (90%)
copy
e2e/src/test/java/org/apache/dolphinscheduler/testcase/{testDeleteData/TestDeleteUser.java
=> deleteData/DeleteUserTest.java} (91%)
copy
e2e/src/test/java/org/apache/dolphinscheduler/testcase/{testDeleteData/TestDeleteProject.java
=> deleteData/DeleteWorkflowTest.java} (60%)
copy sql/upgrade/{1.3.3_schema/postgresql/dolphinscheduler_dml.sql =>
1.3.2_schema/mysql/dolphinscheduler_ddl.sql} (100%)
copy sql/upgrade/{1.3.3_schema => 1.3.2_schema}/mysql/dolphinscheduler_dml.sql
(84%)
copy sql/upgrade/{1.3.3_schema/postgresql/dolphinscheduler_dml.sql =>
1.3.2_schema/postgresql/dolphinscheduler_ddl.sql} (100%)
copy sql/upgrade/{1.3.3_schema =>
1.3.2_schema}/postgresql/dolphinscheduler_dml.sql (94%)
