1. 11 1月, 2021 1 次提交
  2. 12 11月, 2020 2 次提交
    • B
      Revert "[Draft][Merge][133-dev]133 merge dev (#4031)" (#4057) · 02dbd3ee
      bao liang 提交于
      This reverts commit ad2d9f99.
      02dbd3ee
    • B
      [Draft][Merge][133-dev]133 merge dev (#4031) · ad2d9f99
      bao liang 提交于
      * [Feture-3327][ui]Add the function of re-uploading files in the resource center
      
      * [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
      
      * Before creating a workflow, clear the canvas
      
      * [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
      
      * [Feture-3327][ui]Add the function of re-uploading files in the resource center
      Co-authored-by: Nwuchunfu <319355703@qq.com>
      
      * [Improvement-3327][api]support re-upload the resource file (#3395)
      
      * [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
      
      * [Fix-3390][api]Running hive sql task need find the hdfs path correctly
      
      * [Fix-3390][api]Running hive sql task need find the hdfs path correctly
      
      * update soft version
      
      * hive UDF function to modify the background color
      
      * fix
      
      * fix bug: Fix master task dependency check bug
      
      * cancel spark task version check (#3406)
      Co-authored-by: NEights-Li <yelli.hl@gmail.com>
      
      * [Bug][ui]Fix front-end bug #3413
      
      * [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
      
      * Optimize dag
      
      * Update actions.js (#3401)
      
      * [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
      
      * [PROPOSAL-3139] Datasource selection changes from radio to select
      
      * [PROPOSAL-3139] Datasource selection changes from radio to select
      
      * [BUG FIX] issues #3256
      
      * [BUG FIX] issues #3256
      
      * [BUG FIX] issues #3256
      
      * [Fix-3256][ui] Fix admin user info update error
      
      * [Fix-3256][ui] Fix admin user info update error
      
      * [Fix-3256][ui] Fix admin user info update error
      
      * [Fix-3256][ui] Fix admin user info update error
      
      * reset createUser.vue
      
      * [Fix-3256][ui] Fix admin user info update error
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nwuchunfu <319355703@qq.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      
      * [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
      
      * dag connection add check
      
      * fix
      
      * [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
      
      * Remove node deep monitoring
      
      * If worker group id is null,don't need to set the value of the worker group (#3460)
      
      * [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
      
      * [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
      
      * [ui]Code optimization
      
      * fix
      
      * fix
      
      * [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
      
      * [optimization][ui]Prevent the shell script input box from being empty
      
      * [Fix-3462][api]If login user is admin,need list all udfs (#3465)
      
      * [Fix-3462][api]If login user is admin,need list all udfs
      
      * [Fix-3462][api]add the test on the method of QueryUdfFuncList
      
      * [Fix-3462][api]fix the code smell
      
      * [Fix-3462][api]fix the code smell
      
      * [Fix-3462][api]fix the code smell
      
      * [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
      
      * [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
      
      * [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
      
      * fix bug: Fix master task dependency check bug (#3473)
      Co-authored-by: Nlenboo <baoliang@analysys.com.cn>
      
      * [maven-release-plugin] prepare release 1.3.2
      
      * [maven-release-plugin] prepare for next development iteration
      
      * fix ci_e2e fail (#3497)
      
      * [Fix-3469][api]Should filter the resource by the different program type (#3498)
      
      * [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
      
      * [Fix-3469][api]Should list python file and jar file
      
      * [Fix-3469][api]Should filter the resource by the different program type
      
      * [Fix-3469][api]fix the code smell
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback (#3499)
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * [maven-release-plugin] prepare release 1.3.2
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
      
      * fix
      
      * Revert "fix ci_e2e fail (#3497)"
      
      This reverts commit e367f90b.
      
      * test
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback (#3503)
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      
      * test
      
      * test release 1.3.2 version rollback
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * [maven-release-plugin] prepare release 1.3.2
      
      * [maven-release-plugin] prepare for next development iteration
      
      * test release 1.3.2 version rollback (#3504)
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      
      * test
      
      * test release 1.3.2 version rollback
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * [maven-release-plugin] prepare release 1.3.2
      
      * [maven-release-plugin] prepare for next development iteration
      
      * fix ds muti-level directory in zk, which lead to fail to assign work
      
      * add login user check some actions in api
      
      * [Hotfix][ci] Fix e2e ci docker image build error
      
      * modify tag 1.3.0 to HEAD
      
      * modify tag 1.3.0 to HEAD (#3525)
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      
      * test
      
      * test release 1.3.2 version rollback
      
      * modify tag 1.3.0 to HEAD
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * remove OGNL part of the mybaits notice (#3526)
      
      * [maven-release-plugin] prepare release 1.3.2
      
      * [maven-release-plugin] prepare for next development iteration
      
      * release 1.3.2 version rollback (#3527)
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      
      * test
      
      * test release 1.3.2 version rollback
      
      * modify tag 1.3.0 to HEAD
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * [ui]Script input box to modify the delay loading time
      
      * fix
      
      * fix
      
      * fix
      
      * fix
      
      * modify general user can't create token
      
      * [ui]It is forbidden to select non-existent resources and modify the tree display data format
      
      * modify general user can't create token (#3533)
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * [Feature] JVM parameter optimization , related issue #3370
      
      * test release 1.3.2 version rollback
      
      * test release 1.3.2 version rollback
      
      * test
      
      * test release 1.3.2 version rollback
      
      * modify tag 1.3.0 to HEAD
      
      * modify general user can't create token
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * if task is null , set task type is null instead of "null"
      
      * [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
      
      * [Fix-3536][api]If user didn't have tenant,create resource will NPE
      
      * [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
      
      * modify general user can't create,delete,update token (#3538)
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
      
      * fix
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
      
      * [fixbug][ui]Repair the master and worker management instrument display
      
      * [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
      
      * [fixbug][ui]Remove non-existent or deleted resources disabled
      
      * [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
      
      * [fix-3553][ui]Repair click workflow connection, select the entire path
      
      * fix
      
      * fix
      
      * [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
      
      * [Improvement-3720][ui] js mailbox verification fix
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      
      * [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      
      * [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * [Fix-3616][Server] when worker akc/response master exception , async retry
      
      * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      
      * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
      
      * [BugFixed] issue #3258 (#3265)
      
      * 'ExecutionStatus'
      
      * '3258'
      
      * Update WorkerGroupServiceTest.java
      
      * Delete UserState.java
      
      * Delete ResourceSyncService.java
      
      * Delete core-site.xml
      
      * Delete hdfs-site.xml
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      
      * [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
      
      * [Bug-3713][HadoopUtils] catfile method Stream not closed  (#3715)
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * dag  add close button
      
      * reset last version
      
      * reset last version
      
      * dag add close buttion
      
      dag add close buttion
      
      * update  CLICK_SAVE_WORKFLOW_BUTTON  xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * Update CreateWorkflowLocator.java
      
      modify submit workflow button
      
      * Update CreateWorkflowLocator.java
      
      * Update CreateWorkflowLocator.java
      
      modify CLICK_ADD_BUTTON
      
      * Update CreateWorkflowLocator.java
      
      delete print
      
      * Update CreateWorkflowLocator.java
      
      1
      
      * Update CreateWorkflowLocator.java
      
      1
      
      * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
      
      in addition
      
      update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
      
      * Update dag.vue
      
      * Update dag.vue
      
      * Update dag.vue
      
      * Update CreateWorkflowLocator.java
      
      * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
      
      This reverts commit 3a2cba7a
      
      * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
      
      in addition
      
      update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
      
      * Update dolphinscheduler-daemon.sh
      
      * catfile method Stream not closed
      
      * catfile method Stream not closed
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      
      * [Fix-#3713][common]Fix that catfile method Stream not closed
      
      * [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
      
      * [Bug-3713][HadoopUtils] catfile method Stream not closed  (#3715)
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * dag  add close button
      
      * reset last version
      
      * reset last version
      
      * dag add close buttion
      
      dag add close buttion
      
      * update  CLICK_SAVE_WORKFLOW_BUTTON  xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * Update CreateWorkflowLocator.java
      
      modify submit workflow button
      
      * Update CreateWorkflowLocator.java
      
      * Update CreateWorkflowLocator.java
      
      modify CLICK_ADD_BUTTON
      
      * Update CreateWorkflowLocator.java
      
      delete print
      
      * Update CreateWorkflowLocator.java
      
      1
      
      * Update CreateWorkflowLocator.java
      
      1
      
      * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
      
      in addition
      
      update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
      
      * Update dag.vue
      
      * Update dag.vue
      
      * Update dag.vue
      
      * Update CreateWorkflowLocator.java
      
      * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
      
      This reverts commit 3a2cba7a
      
      * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
      
      in addition
      
      update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
      
      * Update dolphinscheduler-daemon.sh
      
      * catfile method Stream not closed
      
      * catfile method Stream not closed
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      
      * [Fix-#3713][common]Fix that catfile method Stream not closed
      Co-authored-by: NBoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      
      * [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
      
      * [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
      
      * Bugfix: Fix the new tenant already exists prompt
      
      * Feature: Add test cases
      
      * Update TenantServiceTest.java
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      
      * Set up JDK 11 for SonarCloud in github action. (#3052)
      
      * Set up JDK 11 for SonarCloud in github action.
      
      * Fix javadoc error with JDK 11.
      
      * Prevent Javadoc from stopping if it finds any html errors.
      
      * [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
      
      * add verify tenant name cannot contain special characters.
      
      * [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
      
      * fix
      
      * fix
      
      * fix
      
      * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
      
      * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
      
      * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
      
      * [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
      
      * [fixbug-3887][ui]Fix missing English translation of re-upload files
      
      * add process define name verify. (#3879)
      
      * Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
      
      * revert pr 3872
      
      * [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
      
      * fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
      
      * delete unused code
      
      * update code smell
      
      * refactor sub work command process
      
      * add process service ut
      
      * add license header
      
      * fix some code smell
      
      * chang ut java8 to java11
      
      * update sonar to java11
      
      * copy ut config from dev
      
      * remove checkstyle
      
      * revert to 1.3.3
      
      * change proess service test to executor service
      
      * add process service test
      
      * add process service test
      
      * revert
      
      * revert
      
      * add comments
      
      * change dev to 1.3.3-release
      
      * revert
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
      
      * [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error  (#3899)
      
      * fix bug : error message
      
      * fix code smell
      
      * fix code smell
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat
      Co-authored-by: NKirs <acm_master@163.com>
      
      * Repair check box cannot be canceled
      
      * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
      
      * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
      
      * [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat
      
      * [FIX_#3789][remote]cherry pick from dev to support netty heart beat
      
      * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
      
      * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
      Co-authored-by: NKirs <acm_master@163.com>
      
      * [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
      
      * Workflow definition name re-modified and added check
      
      * [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
      
      * update code.
      
      * [#3931][ui]Field name optimization for spark, flink, and mr
      
      * change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
      
      * [maven-release-plugin] prepare release 1.3.3
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
      
      * fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
      
      * [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
      
      * solve too many files, close logClientService (#3971)
      
      * fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
      
      * [Fix-#3618][server] resolve task executed finished but not release the file handle
      
      * [Fix-#3618][server] resolve task executed finished but not release the file handle
      
      * [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
      
      * [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
      
      * fix #3966 sub process doesnot send alert mail after process instance ending.
      
      * fix bug 3964: sub_process The timeout warning does not take effect
      add timeout warning for sub_process/dependent task.
      
      * fix code smell
      
      * fix code smell
      
      * fix code smell
      
      * update worker group inherit from parent
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * fix import dolphinscheduler_mysql.sql insert admin user data
      
      * [FIX-3929] condition task would post wrong tasks when failover. (#3999)
      
      * fix #3966 sub process doesnot send alert mail after process instance ending.
      
      * fix bug 3964: sub_process The timeout warning does not take effect
      add timeout warning for sub_process/dependent task.
      
      * fix code smell
      
      * fix code smell
      
      * fix code smell
      
      * update worker group inherit from parent
      
      * remove stdout in logback configuration
      
      * fix bug #3929 condition task would post error when failover.
      
      * remove unused test
      
      * add comments
      
      * add skip node judge
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * [FIX-3929]  because of no lock, start up failover would dispatch two same tasks. (#4004)
      
      * fix #3966 sub process doesnot send alert mail after process instance ending.
      
      * fix bug 3964: sub_process The timeout warning does not take effect
      add timeout warning for sub_process/dependent task.
      
      * fix code smell
      
      * fix code smell
      
      * fix code smell
      
      * update worker group inherit from parent
      
      * remove stdout in logback configuration
      
      * fix bug #3929 condition task would post error when failover.
      
      * remove unused test
      
      * add comments
      
      * add skip node judge
      
      * fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * revert pom version to 1.3.3-release
      
      * [maven-release-plugin] prepare release 1.3.3
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [release]revert pom version to 1.3.3-release
      
      * fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * [maven-release-plugin] prepare release 1.3.3
      
      * [maven-release-plugin] prepare for next development iteration
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * refactor code style
      
      * refactor code style
      
      * refactor code style
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * refactor ut test
      
      * refactor ut test
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * refactor ut
      
      * merge from 1.3.3-release
      
      * refactor ut
      
      * refactor ut
      
      * refactor
      
      * refactor
      
      * refactor code style
      
      * refactor code style
      
      * refactor code style
      
      * refactor code style
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * merge from 1.3.3-release
      
      * refactor code style
      Co-authored-by: Nbreak60 <790061044@qq.com>
      Co-authored-by: Nwuchunfu <319355703@qq.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      Co-authored-by: Nlenboo <baoliang@analysys.com.cn>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: NYelli <amarantine@my.com>
      Co-authored-by: NEights-Li <yelli.hl@gmail.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: NXiaotaoYi <v-xiayi@hotmail.com>
      Co-authored-by: NYichao Yang <1048262223@qq.com>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NBoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
      Co-authored-by: Nmuzhongjiang <mu_zhongjiang@163.com>
      Co-authored-by: NJave-Chen <baicai.chen@gmail.com>
      Co-authored-by: Nzhuangchong <zhuangchong6@163.com>
      Co-authored-by: Nzhuangchong <37063904+zhuangchong@users.noreply.github.com>
      Co-authored-by: NKirs <acm_master@163.com>
      Co-authored-by: Nlgcareer <lgcareer@apache.org>
      Co-authored-by: Nwulingqi <wulingqi@baijiahulian.com>
      ad2d9f99
  3. 07 11月, 2020 1 次提交
  4. 06 11月, 2020 1 次提交
  5. 29 10月, 2020 3 次提交
  6. 28 10月, 2020 3 次提交
  7. 17 10月, 2020 3 次提交
  8. 17 8月, 2020 4 次提交
  9. 14 8月, 2020 12 次提交
  10. 13 7月, 2020 1 次提交
    • B
      merge from 1.3.1-release (#3161) · 657ea475
      bao liang 提交于
      * merge from 1.3.1-release
      
      * [bugfix] remove Conflicting configuration sudo and user (#3038)
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      
      * remove some standard notices in order to cut down the NOTICE file. (#3101)
      
      * #3084 remove some standard notices in order to cut down the NOTICE file.
      
      * update exclude element sql/soft_version of rat plugin
      
      * update soft_version
      
      * merge from 1.3.1-release
      
      * fix 3112:download udf resource need find the tenant code of resource owner (#3114)
      
      * fix 3112:download udf resource need find the tenant code of resource owner
      
      * fix 2975:download resource need find the tenant code of resource owner
      
      * remove useless code
      
      * merge from 1.3.1-release
      
      * remove some notes (#3127)
      Co-authored-by: Nlenboo <baoliang@analysys.com.cn>
      
      * fix Permission denied if not found dolphinscheder-env.sh on 1.3.1 (#3128)
      
      * fix Permission denied if not found dolphinscheder-env.sh
      
      * update some comments on method
      
      * add PropertyPlaceholderHelper on license (#3129)
      
      * update license header location
      
      * add PropertyPlaceholderHelper on license
      
      * merge from 1.3.1-release
      
      * change from 1.3.0  to 1.3.2
      
      * add Set import
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nzhangchunyang <zhangchunyang0123@gmail.com>
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      Co-authored-by: Nlenboo <baoliang@analysys.com.cn>
      657ea475
  11. 04 7月, 2020 3 次提交
  12. 03 7月, 2020 2 次提交
  13. 30 6月, 2020 2 次提交
    • B
      Revert "branch dev merge from dev-1.3.0 (#3087)" (#3094) · 5bac559d
      bao liang 提交于
      This reverts commit ab6e4310.
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      5bac559d
    • D
      branch dev merge from dev-1.3.0 (#3087) · ab6e4310
      dailidong 提交于
      * add DolphinScheduler slack channel
      
      * Update README.md
      Co-Authored-By: NJiajie Zhong <zhongjiajie955@hotmail.com>
      
      * modify soft_version 1.2.2 to 1.3.0
      
      * Repair worklist cannot be deleted
      
      * update schema version (#2657)
      
      * change schema version from 1.2.2 to 1.3.0
      
      * change version value of table t_ds_version from 2.0.0 to 1.3.0
      
      * fix bug: sub worker flow in complement data would run start date (#2581) (#2656)
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * Fix conditions node save exception
      
      * add unique key for t_ds_process_definition
      
      * add unique key for t_ds_process_definition
      
      * script variable has "processDefinitionId" is error #2664 (#2666)
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * update filename
      
      * Update dolphinscheduler_ddl.sql
      
      * Delete dolphinscheduler_ddl.sql
      
      * Delete dolphinscheduler_ddl.sql
      
      * add unique key for t_ds_process_definition
      
      add unique key for t_ds_process_definition
      
      * add unique key for t_ds_process_definition
      
      add unique key for t_ds_process_definition
      
      * Modify the alert log file
       
      
      * blank in eamil and left font align #2648 (#2673)
      
      * script variable has "processDefinitionId" is error #2664
      
      * blank in eamil and left font align  #2648
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * fix zookeeper health check and merge volumes into logs volume (#2674)
      
      * fix zookeeper health check and merge volumes into logs volume
      
      1. Fix zookeeper health check
      2. Merge volumes into logs volume
      3. Modify `dockerfile/hooks/build` script
      
      * Modify ci_e2e and docker image registry
      
      * Modify ci_e2e
      
      * Modify ci_e2e
      
      * Modify ci_e2e and move ./dockerfile/hooks/check to ./docker/docker-swarm/
      
      * migrate docker composer and move dockerfile dir to docker/build
      
      * ut docker
      
      * alter dockerfile to docker/build dir
      
      * delete docker-compose old
      
      * delete dockerfile zk
      
      * delete dockerfile zk
      
      * delete dockerfile zk
      
      * [bug fix] some bugs from 1.2.0 to 1.3.0 (#2676)
      
      * fix bug: some bugs about worker group from 1.2.0 to 1.3.0
      
      * fix bug: scheduler from 1.2.0 to 1.3.0 do not work
      
      * fix bug: scheduler from 1.2.0 to 1.3.0 do not work
      
      * fix ut bug
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * add worker group config (#2681)
      
      * update README about DolphinScheduler
      
      * Update issue templates
      
      * update
      
      * regularize api pom xml
      update rpc maven compile to 1.8
      
      * regularize api pom xml
      
      * change commons.lang3.StringUtils to common.utils.StringUtils
      
      * update pom.xml
      
      * update
      
      * correct equals method
      
      * jasper-runtime is needed when api server start
      
      * jasper-runtime jar is needed when api server start
      
      * combine logback config of master/worker/alert/api server to one logback.xml
      
      * remove tomcat runtime jar
      
      * add UT
      
      * add license
      
      * remove jasper-runtime jar, not need anymore
      
      * sovle jar conflict, remove servlet-api 2.5 jar
      
      * remove servlet 2.5
      
      * add embedded database h2 and update embedded zookeeper
      
      * delete logs
      
      * add license
      
      * change log level to INFO
      
      * simplify and optimize config
      
      * add development state
      
      * simplify common config
      
      * add worker group config
      
      * add worker group config
      Co-authored-by: Nlidongdai <escheduler@outlook.com>
      Co-authored-by: Ndailidong <dolphinschedule@gmail.com>
      
      * delete log files while deleting process instances #2463 (#2693)
      
      * script variable has "processDefinitionId" is error #2664
      
      * blank in eamil and left font align  #2648
      
      * delete log files while deleting process instances #2463
      
      * delete log files while deleting process instances #2463
      
      * delete log files while deleting process instances #2463
      
      * delete log files while deleting process instances #2463
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * Update dolphinscheduler_ddl.sql
      
      * Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml (#2692)
      
      * Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml
      
      1. add initdb volume for pg service in docker-compose.yml
      2. modify ci_ut.yml
      
      * add sudo in ci_ut.yml
      
      * Query the metadata of indexes is not correct in postgresql/dolphinscheduler_ddl.sql
      
      1. replace information_schema.STATISTICS to pg_stat_all_indexes
      2. modify ProcessDefinitionMapperTest.java
      
      * Remove inner zk and pg
      
      * add inner pg
      
      * conditions The task node adds a background color to distinguish successful and failed connections
      
      * add LoggerServerTest UT (#2713)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * add UT (#2717)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * fix worker group config no effect (#2719)
      
      * Conditional judgment adds text
      
      * fix
      
      * 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)
      
      * Underline the list of workflow operations
      
      * Modify HDFS/S3 path (#2736)
      
      * Modify HDFS/S3 path
       
      
      * Modify HDFS/S3 path
       
      
      * Update common.properties
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      
      * Modify ip configuration
      
      * set worker group  (#2743)
      
      * simple config
      
      * fix worker group config no effect
      
      * fix #2598::allow to update resource suffix,but if it is authorized to other users,it is not allowed (#2732)
      
      * fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed.
      
      * add RESOURCE_IS_AUTHORIZED status
      
      * verify whether the suffix is empty
      
      * remove extra variables
      
      * fix code smell
      
      * Update known-dependencies.txt
      
      * update worker group config (#2746)
      
      * fix worker group config no effect
      
      * remove codehaus janino jar
      the license about janino maybe not compatiable with Apache v2
      
      * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
      
      # Conflicts:
      #	dolphinscheduler-server/src/main/resources/config/install_config.conf
      
      * Update datasource.properties
      
      * remove codehaus janino jar (#2742)
      
      the license about janino maybe not compatiable with Apache v2
      
      * [bug fix] fix bug:2634:Process shows success,when the task of the process is killed in the terminal (#2731)
      
      * fix bug: some bugs about worker group from 1.2.0 to 1.3.0
      
      * fix bug: scheduler from 1.2.0 to 1.3.0 do not work
      
      * fix bug: scheduler from 1.2.0 to 1.3.0 do not work
      
      * fix ut bug
      
      * fix bug: Process shows success,when the task of the process is killed in the termina
      
      * fix bug #2634: Process shows success,when the task of the process is killed in the terminal
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * Update known-dependencies.txt (#2748)
      
      * fix getWorkers bug on RunConfig (#2747)
      
      * fix worker group config no effect
      
      * remove codehaus janino jar
      the license about janino maybe not compatiable with Apache v2
      
      * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
      
      # Conflicts:
      #	dolphinscheduler-server/src/main/resources/config/install_config.conf
      
      * datasource config
      
      * Update datasource.properties
      
      * fix RunConfig bug
      
      * master select worker filter high load worker #2704 (#2733)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * Fix rename check parameter
      
      * fix
      
      * fix 2598:change getId to getUserId (#2757)
      
      * fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed.
      
      * add RESOURCE_IS_AUTHORIZED status
      
      * verify whether the suffix is empty
      
      * remove extra variables
      
      * fix code smell
      
      * change getId to getUserId
      
      * Fix MySQL autoDeserialize bug (#2728)
      
      * Fix MySQL autoDeserialize bug
      
      * add MySQLDataSourceTest
      
      * Fix workflow definition history node data cannot be opened
      
      * fix
      
      * delete normalize
      
      * update e2e chrome version (#2775)
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      
      * Modify the background color of conditions task node connection
      
      * [BUF FIX]fix: the master would be blocked when worker group not exists (#2764)
      
      * feature: add number configuration for master dispatch tasks
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix ut
      
      * fix ut
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * [BUG FIX] fix bug: dependent task failed when conditions task exists (#2768)
      
      * fix bug 2464: change dependent task for process.
      
      * remove unused code
      
      * add ut
      
      * add ut
      
      * update comments
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * Hourly dependency configuration, 'currentHour' and 'last24Hours' (#2696)
      
      * [feature] Add hourly dependency scenarios
      
      * [Feature] #2680
      
      add DependentUtilsTest UT
      Co-authored-by: Nchangqun.xu <changqun.xu@17zuoye.com>
      Co-authored-by: Nxuchangqun <changqun.x@gmail.com>
      
      * fix sql task bug #2739 (#2741)
      
      * Solve the failure to execute non-query sql
      
      * fix sql task bug
      Co-authored-by: Nsunchaohe <sunzhaohe@linklogis.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      
      * Worker group adds check
      
      * fix
      
      * Worker group adds check (#2787)
      
      * Worker group adds check
      
      * fix
      
      * add not worker log and remove worker invalid property (#2784)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * add not worker log and remove worker invalid property
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory (#2786)
      
      * fixed #2788  resolve the bug #2788  (#2789)
      
      * Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory
      
      * fixed #2788
      
      * [BUG FIX] fix bug:cannot pause work flow when task state is "submit success" (#2783)
      
      * feature: add number configuration for master dispatch tasks
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix ut
      
      * fix ut
      
      * fix bug(2781): cannot pause work flow when task state is "submit success"
      
      * fix code smell
      
      * add mysql other param blank judge
      
      * test
      
      * update comments
      
      * update comments
      
      * add ut
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * fix bug:#2735 (#2770)
      
      1. store process id in zk.
      2. resolve host and port through zk path.
      3. modify ui key.
      
      * Modify startup parameter worker group value
      
      * Fix [Bug] process definition json worker group convert #2794 (#2795)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * add not worker log and remove worker invalid property
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * [BUG FIX]fix bug: Restart the worker service again, the previously submitted successful tasks are not executed bug (#2800)
      
      * feature: add number configuration for master dispatch tasks
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix ut
      
      * fix ut
      
      * fix bug(2781): cannot pause work flow when task state is "submit success"
      
      * fix code smell
      
      * add mysql other param blank judge
      
      * test
      
      * update comments
      
      * update comments
      
      * add ut
      
      * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed
      
      * update comments
      
      * add sleep
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * delete unnecessary configuration items (#2803)
      
      * rename worker_group_id to worker_group and set the value of worker_group_name (#2801)
      
      * process definition json worker group convert #2794 (#2809)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * add not worker log and remove worker invalid property
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * compatible old version host not port delete log file (#2811)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * master select worker filter high load worker #2704
      
      * add not worker log and remove worker invalid property
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * process definition json worker group convert #2794
      
      * compatible old version host not port delete log file
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes (#2806)
      
      * delete unnecessary configuration items
      
      * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes
      
      * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes
      
      * fix oracle connect failure (#2812)
      
      * use method getJdbcUrl of parent
      
      * Remove the incorrect print message
      
      * Modify process group workerGroup value display and filter child node duplicate values
      
      * Repair process definition bulk delete function
      
      * when init workflow, the tenantId linked by the tenantId of user
      
      * dag download does not refresh, modify the task instance operation width value
      
      * fix
      
      * [bug fix]fix bug: After the master is fault-tolerant, it cannot resume operation  (#2813)
      
      * feature: add number configuration for master dispatch tasks
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix ut
      
      * fix ut
      
      * fix bug(2781): cannot pause work flow when task state is "submit success"
      
      * fix code smell
      
      * add mysql other param blank judge
      
      * test
      
      * update comments
      
      * update comments
      
      * add ut
      
      * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed
      
      * update comments
      
      * add sleep
      
      * add null point check
      
      * fix bug:After the master is fault-tolerant, it cannot resume operation
      
      * fix bug: do not failover the host is 'NULL' process
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * When update the data source,the host and port show error (#2821)
      
      * When update the data source,the host and port show error
      
      * update DataSourceServiceTest
      
      * update DataSourceServiceTest
      
      * update DataSourceServiceTest
      
      * Fix ORACLE service name value display
      
      * Add tips for download workflow
      
      * fix
      
      * [bug fix] fix: The workflow is fault-tolerant and 2 task instances are generated (#2833)
      
      * feature: add number configuration for master dispatch tasks
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix bug(#2762) the master would be blocked when worker group not exists
      
      * fix ut
      
      * fix ut
      
      * fix bug(2781): cannot pause work flow when task state is "submit success"
      
      * fix code smell
      
      * add mysql other param blank judge
      
      * test
      
      * update comments
      
      * update comments
      
      * add ut
      
      * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed
      
      * update comments
      
      * add sleep
      
      * add null point check
      
      * fix bug:After the master is fault-tolerant, it cannot resume operation
      
      * fix bug: do not failover the host is 'NULL' process
      
      * fix bug:worker failover error.
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * add maven Xmx to 5g
      
      * fix bug: send task result to master until success. (#2839)
      
      * fix bug: send task result to master until success.
      
      * fix bug: send task result to master until success.
      
      * add sleep
      
      * set null if send result failed
      
      * set null if send result failed
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * Fix errors when running on win10 (#2842)
      
      1. DS cant run bat script
      2. DS cant run python script
      3. DS cant run datax script
      
      * Fix abnormal display of regular worker parameters
      
      * add source license full text into source license (#2840)
      
      * add source license full text into source license
      
      * exclude ScriptRunner.java on rat check
      
      * fix table not exist when init db metadata (#2838)
      
      * fix table not exist when init db metadata
      
      * fix db init error
      
      * fix ds-1.3.0 init db
      
      * init db modify process instance json
      Co-authored-by: Neights <yelli.hl@foxmail.com>
      
      * change notice copyright date from 2019 to 2019-2020 (#2847)
      
      * add source license full text into source license
      
      * exclude ScriptRunner.java on rat check
      
      * change notice copyright date from 2019 to 2019-2020
      
      * fix [BUG] TaskExecutionContextCacheManagerImpl Do not execute removeByTaskInstanceId #2745 (#2754)
      
      * mr resource display and create user username length cannot be less than 3
      
      * fix
      
      * fix
      
      * fix
      
      * fix table T_DS_ALERT (#2854)
      
      * fix worker group config no effect
      
      * remove codehaus janino jar
      the license about janino maybe not compatiable with Apache v2
      
      * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
      
      # Conflicts:
      #	dolphinscheduler-server/src/main/resources/config/install_config.conf
      
      * datasource config
      
      * Update datasource.properties
      
      * fix RunConfig bug
      
      * remove param monitor server state
      
      * fix table T_DS_ALERT
      
      * fix
      
      * fix
      
      * modify t_ds_task_instance app_link change sql (#2861)
      
      * change max length of user name to 39 (#2856)
      
      * fix bug: send task result to master until success.
      
      * fix bug: send task result to master until success.
      
      * add sleep
      
      * set null if send result failed
      
      * set null if send result failed
      
      * change max length of username to 39
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * copy resources need get top directory first (#2866)
      
      * copy resources need get top directory first
      
      * copy resources need get top directory first
      
      * fix #2860:copy files and create empty directory (#2876)
      
      * copy resources need get top directory first
      
      * copy resources need get top directory first
      
      * fix #2860:copy files and create empty directory
      
      * Fix bug:If user didn't set the value of tenant,release process definition fail (#2885)
      
      * copy resources need get top directory first
      
      * copy resources need get top directory first
      
      * fix #2860:copy files and create empty directory
      
      * Fix bug:If user didn't set the value of tenant,release process definition online fail
      
      * merge method updateuser if and fix bug#2892
      
      fix [BUG] When editing user information, clear the phone number, the database table t_ds_user.phone is not cleared #2892
      
      * fix bug: sqoop mysql import params error (#2896)
      
      * fix bug: sqoop mysql import params error
      
      * fix bug: sqoop mysql import params error
      
      * Fixed selection of tenant value and defalut changed to lower case
      
      * update how to build and remove docs link (#2906)
      
      * Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908)
      
      * fix create table sql exception (#2912)
      
      fix create table sql exception
      
      * fix #2910 master server will show exception for some time when it restart (#2913)
      
      * fix worker group config no effect
      
      * remove codehaus janino jar
      the license about janino maybe not compatiable with Apache v2
      
      * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
      
      # Conflicts:
      #	dolphinscheduler-server/src/main/resources/config/install_config.conf
      
      * datasource config
      
      * Update datasource.properties
      
      * fix RunConfig bug
      
      * remove param monitor server state
      
      * fix table T_DS_ALERT
      
      * update h2 database
      
      * fix #2910 master server will show exception for some time when it restart
      
      * Fixbug datax task (#2909)
      
      * fix:  local param bug
      
      * fix: UT bug
      Co-authored-by: NRubik-W <whm_777@163.com>
      
      * [license] add license and notice (#2916)
      
      * fix bug: send task result to master until success.
      
      * fix bug: send task result to master until success.
      
      * add sleep
      
      * set null if send result failed
      
      * set null if send result failed
      
      * change max length of username to 39
      
      * test for gc
      
      * change version to 1.3.0
      
      * check and add some license files
      
      * check and add some license files
      
      * revert
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      
      * fix oom when no master is active in dev-1.3.0 (#2918)
      
      * fix worker group config no effect
      
      * remove codehaus janino jar
      the license about janino maybe not compatiable with Apache v2
      
      * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
      
      # Conflicts:
      #	dolphinscheduler-server/src/main/resources/config/install_config.conf
      
      * datasource config
      
      * Update datasource.properties
      
      * fix RunConfig bug
      
      * remove param monitor server state
      
      * fix table T_DS_ALERT
      
      * update h2 database
      
      * fix #2910 master server will show exception for some time when it restart
      
      * fix oom when no master is active
      
      * fix worker oom when master server restart
      
      * fix oom
      
      * fix
      
      * add UT
      
      * fix worker group config no effect
      
      * Python, sql, sqoop,datax task node editor adds zoom function #2929 (#2933)
      
      * Python, sql, sqoop task node editor adds zoom function
      
      * fix
      
      * change 1.3.0 to 1.3.0-snapshot
      
      * add janino-3.0.12.jar
      
      * delete duplicate codes
      
      * add commons-compiler-3.0.12.jar
      
      * change delete status according to delete action result
      
      * Delete the pom files animation.scss, _normalize.scss and _animation.scss under the common folder
      
      * Change email to default (#2981)
      
      * add mybatis-3 notice in the top-level notice (#3003)
      
      * fix download resource file that under the directory error (#3007)
      
      * add mybatis-3 notice in the top-level notice
      
      * fix download resource file that under the directory error
      
      * Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008)
      
      * Change email to default
      
      * Fix unfiltered jar files in resource directory and UDF upload resource parameters
      
      * fix singe resource manager will NPE (#3013)
      
      * fix worker group config no effect
      
      * remove codehaus janino jar
      the license about janino maybe not compatiable with Apache v2
      
      * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
      
      # Conflicts:
      #	dolphinscheduler-server/src/main/resources/config/install_config.conf
      
      * datasource config
      
      * Update datasource.properties
      
      * fix RunConfig bug
      
      * remove param monitor server state
      
      * fix table T_DS_ALERT
      
      * update h2 database
      
      * fix #2910 master server will show exception for some time when it restart
      
      * fix oom when no master is active
      
      * fix worker oom when master server restart
      
      * fix oom
      
      * fix
      
      * add UT
      
      * fix worker group config no effect
      
      * fix singe resource manager will NPE
      
      * Update HadoopUtilsTest.java
      
      * merge from dev-1.3.0
      
      * update ut
      
      * remove duplicate code
      
      * remove exception ut
      
      * remove exception ut
      
      * remove exception ut
      
      * remove exception ut
      
      * remove exception ut
      
      * [bugfix] remove Conflicting configuration sudo and user (#3038)
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      
      * [bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2. metainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml (#3032)
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      
      * [feature] readme.md adds instructions for changing environment variables (#3031)
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      
      * merge from dev
      
      * Change favicon.ico icon introduction method and package compilation to increase version number (#3030)
      Co-authored-by: NJiajie Zhong <zhongjiajie955@hotmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      Co-authored-by: Nbreak60 <790061044@qq.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      Co-authored-by: Nbao liang <29528966+lenboo@users.noreply.github.com>
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      Co-authored-by: NSimon <3656562@qq.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      Co-authored-by: N张世鸣 <zhangshiming@cvte.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nliwenhe1993 <liwenhe@apache.org>
      Co-authored-by: Nxiaochun.liu <xiaochun.liu@centurygame.com>
      Co-authored-by: Nlidongdai <escheduler@outlook.com>
      Co-authored-by: Ndailidong <dolphinschedule@gmail.com>
      Co-authored-by: NTboy <guo.jiwei@immomo.com>
      Co-authored-by: Nxuchangqun <58328021+xuchangqun@users.noreply.github.com>
      Co-authored-by: Nchangqun.xu <changqun.xu@17zuoye.com>
      Co-authored-by: Nxuchangqun <changqun.x@gmail.com>
      Co-authored-by: _和's avatarzixi0825 <649790970@qq.com>
      Co-authored-by: Nsunchaohe <sunzhaohe@linklogis.com>
      Co-authored-by: Nzhangchunyang <zhangchunyang0123@gmail.com>
      Co-authored-by: Ntlhhup <137273278@qq.com>
      Co-authored-by: Nyelli.hl@foxmail.com <amarantine@my.com>
      Co-authored-by: Neights <yelli.hl@foxmail.com>
      Co-authored-by: Nyaoyao <42244568+1445103710@users.noreply.github.com>
      Co-authored-by: N小清 <62982788+597365581@users.noreply.github.com>
      Co-authored-by: Ngabry.wu <gabrywu@apache.org>
      Co-authored-by: Nt1mon <178317391@qq.com>
      Co-authored-by: NRubik-W <39549317+Rubik-W@users.noreply.github.com>
      Co-authored-by: NRubik-W <whm_777@163.com>
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      ab6e4310
  14. 29 6月, 2020 2 次提交