1. 15 9月, 2021 5 次提交
  2. 14 9月, 2021 3 次提交
  3. 13 9月, 2021 5 次提交
  4. 11 9月, 2021 4 次提交
  5. 10 9月, 2021 5 次提交
  6. 09 9月, 2021 6 次提交
  7. 08 9月, 2021 12 次提交
    • O
      [BUG][API] the interface of 'authed project' is missed (#6136) · edb8f3c4
      OS 提交于
      * fix bug: auth project and auth datasource error.
      
      * fix bug: cannot save process definition if environment_code is null;
      edb8f3c4
    • K
      Merge pull request #6133 from CalvinKirs/task-end · 9d7f70bc
      Kerwin 提交于
      [Feature][Plugin]TaskSPI
      9d7f70bc
    • C
      fix code style · 5b98ea01
      CalvinKirs 提交于
      5b98ea01
    • C
      fix code style · d6d39802
      CalvinKirs 提交于
      d6d39802
    • C
      fix code style · ac8fafa3
      CalvinKirs 提交于
      ac8fafa3
    • C
      Merge remote-tracking branch 'upstream/dev' into task-end · 2dd52793
      CalvinKirs 提交于
      # Conflicts:
      #	.asf.yaml
      #	dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
      #	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertGroupControllerTest.java
      #	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
      #	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
      #	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/ConditionsTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/DependentTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterBaseTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/SubProcessTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/WorkflowExecuteThreadTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessorTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThreadTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThreadTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutorTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTaskTest.java
      #	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
      #	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
      #	dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
      #	dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/DolphinSchedulerPlugin.java
      #	dolphinscheduler-standalone-server/pom.xml
      #	dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/server/StandaloneServer.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTaskChannelFactory.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-python/src/main/java/org/apache/dolphinscheduler/plugin/task/python/PythonCommandExecutor.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTask.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/SqoopTask.java
      #	dolphinscheduler-ui/package.json
      #	dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
      #	dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
      #	dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
      #	sql/dolphinscheduler_h2.sql
      2dd52793
    • C
      Merge remote-tracking branch 'upstream/dev' into task-end · dbb4adf6
      CalvinKirs 提交于
      # Conflicts:
      #	.asf.yaml
      #	dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
      #	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
      #	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertGroupControllerTest.java
      #	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
      #	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
      #	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
      #	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/ConditionsTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/DependentTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterBaseTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/SubProcessTaskExecThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java
      #	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/WorkflowExecuteThreadTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessorTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThreadTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThreadTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutorTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java
      #	dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTaskTest.java
      #	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
      #	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
      #	dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
      #	dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/DolphinSchedulerPlugin.java
      #	dolphinscheduler-standalone-server/pom.xml
      #	dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/server/StandaloneServer.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTaskChannelFactory.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-python/src/main/java/org/apache/dolphinscheduler/plugin/task/python/PythonCommandExecutor.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTask.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
      #	dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/SqoopTask.java
      #	dolphinscheduler-ui/package.json
      #	dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
      #	dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
      #	dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
      #	sql/dolphinscheduler_h2.sql
      dbb4adf6
    • K
      fix task plugin shell exec (#6128) · 18047881
      Kerwin 提交于
      18047881
    • D
      Merge pull request #6124 from apache/json_split_two · 1f838e61
      David 提交于
      [Feature][JsonSplit-api] api module controller design
      1f838e61
    • K
      2ac6d2f3
    • K
      [SPI][TASK]TaskPlugin (#6122) · 9508d1e9
      Kirs 提交于
      * [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952)
      
      * [Bug][WorkerServer] SqlTask NullPointerException #5549
      
      * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
      
      * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
      
      * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
      
      * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
      
      * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
      
      * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
      
      * [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428
      
      * fix the readme typing issue (#5998)
      
      * Fix unchecked type conversions
      
      * Use indentation level reported by checkstyle
      
      * Reorganize CI workflows to fasten the wasted time and resources (#6011)
      
      * Add standalone server module to make it easier to develop (#6022)
      
      * Task node of SWITCH (#5939)
      
      * [Feature-#5273][server-master] Task node of SWITCH (#5922)
      
      
      
      Co-authored-by: wangxj <wangxj31>
      
      * remove description of bonecp (#6030)
      Co-authored-by: Nshaojwu <shaojwu@ebay.com>
      
      * [Improvement][Api Module]split alert group list-paging interface (#5941)
      
      * [Improvement][Api Module]split alert group list-paging interface
      
      * [FIX-#6007]Wrong complement date (#6026)
      
      * [FIX-#6007]Wrong complement date
      
      * [style]Wrong complement date
      
      * [Improvement-6024][dist] Remove useless packaging commands (#6029)
      
      ·Remove useless packaging commands in dolphinscheduler-bin.xml
      
      This closes #6024
      Co-authored-by: Nmask <liuhu@zhiyoutec.com>
      
      * [FIX-5908][MasterServer] When executing an compensation task, the execution thread would have a NPE (#5909)
      
      * fix the npe in MasterExec
      
      * fix the compile error
      
      * Add `.asf.yaml` to easily set the GitHub metadata (#6035)
      
      * fix dead server cannot stop (#6046)
      
      * Enhancement Translation (#6042)
      
      * replaced Loading... with i18n
      
      * modified Edit zh_CN translation
      
      * Delete zh_CN.js
      Co-authored-by: NDavid <dailidong66@gmail.com>
      
      * fix bug #6053 zh_CN.js is lost
      
      * [Fix-6038][ui] width of "SQL Statement" in Dag FormLineModal will be shrunk if sql line is too long (#6040)
      
      This closes #6038
      
      * [Improvement] Fix inefficient map iterator (#6004)
      
      * Fix inefficient map iterator
      
      * Use forEach and remove call to valueOf
      
      * Modify AbstractParameters
      
      * Enhance `StandaloneServer` so that we don't need to update the version number manually (#6074)
      
      * Remove invalid character in `.asf.yaml` (#6075)
      
      * Remove invalid character `\n` in `.asf.yaml` (#6077)
      
      It turns out that the invalid character is `\n`
      
      * Add alert server into standalone-server as well and some minor polish (#6087)
      
      * Support starting standalone server in Docker image (#6102)
      
      Also remove unused class
      
      * [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6095)
      
      * [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6085)
      
      * master refactor:
         1. spi for task submit and other actions(pause, kill)
         2. remove threads for process instance and task instance.
         3. add events for process instance and task instance
      
      * ut npe
      
      * add try catch
      
      * code style
      
      * fix critical bugs
      
      * fix critical bugs
      
      * fix critical bugs
      
      * fix critical bugs
      
      * Remove unused params in SwitchTaskTest (#6109)
      
      * [Feature-5987][Server] Support to set multiple environment configs for a certain worker. (#6082)
      
      * support multi environments
      
      * add some test cases
      
      * add an environment vue component
      
      * improve environment form
      
      * improve environment form
      
      * add environment worker group relation
      
      * add environment worker group relation
      
      * add the environment choice for formModel
      
      * set an environment for the task
      
      * modify the modal form of starting process
      
      * add the environment config to TaskExecutionContext
      
      * add the environment config to the timing form
      
      * fix conflicts
      
      * fix issues of the code style
      
      * fix some issues of the code style
      
      * fix some issues of the code style
      
      * fix some issues of the code style
      
      * fix some issues of the code style
      
      * fix some issues of the code style
      
      * fix some bugs in the code review
      
      * add the same table and columns to support H2
      
      * fix some bugs
      
      * [Plugin][Task]Task Spi
      
      * [Plugin][Task]Task Spi
      
      * [Plugin][Task]Task Spi
      
      * [Plugin][Task]Task Spi
      
      * [Plugin][Task]Task Spi
      
      * [Plugin][Task]Task Spi
      Co-authored-by: Ndidiaode18 <563646039@qq.com>
      Co-authored-by: NRoy <yongjuncao1213@gmail.com>
      Co-authored-by: Nlyxell <alyxell@kth.se>
      Co-authored-by: NWenjun Ruan <wenjun@apache.org>
      Co-authored-by: Nkezhenxu94 <kezhenxu94@apache.org>
      Co-authored-by: Nmyangle1120 <942542838@qq.com>
      Co-authored-by: Nwangxj3 <857234426@qq.com>
      Co-authored-by: Ngabry.wu <gabrywu@apache.org>
      Co-authored-by: Nshaojwu <shaojwu@ebay.com>
      Co-authored-by: NShukun Zhang <60541766+andream7@users.noreply.github.com>
      Co-authored-by: 权妖's avatarlinquan <1175687813@qq.com>
      Co-authored-by: Nmask <39329477+Narcasserun@users.noreply.github.com>
      Co-authored-by: Nmask <liuhu@zhiyoutec.com>
      Co-authored-by: Nkyoty <echohlne@gmail.com>
      Co-authored-by: NRichardStark <49977764+RichardStark@users.noreply.github.com>
      Co-authored-by: NDavid <dailidong66@gmail.com>
      Co-authored-by: Nlenboo <baoliang.leon@gmail.com>
      Co-authored-by: Nlilyzhou <lj_zhou@outlook.com>
      Co-authored-by: NOS <29528966+lenboo@users.noreply.github.com>
      Co-authored-by: Njunfan.zhang <zuston.shacha@gmail.com>
      Co-authored-by: 大数据猿人's avatarHua Jiang <jianghuachinacom@163.com>
      9508d1e9
    • L
      code style · c4478f87
      lenboo 提交于
      c4478f87