1. 24 10月, 2019 4 次提交
    • T
      update the resource perm (#1087) · 0beaffa0
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      0beaffa0
    • L
      change method check (#1086) · b94dd37e
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      b94dd37e
    • K
      Optimize ci (#1085) · 0200b947
      khadgarmage 提交于
      * opimize ci
      
      fix dag flink image link bug
      
      * revert package.json
      0200b947
    • T
      merge api constants into common constants (#1084) · fb422af7
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      fb422af7
  2. 23 10月, 2019 11 次提交
    • K
      modify the configs of the dockerfile (#1020) · b77d232d
      khadgarmage 提交于
      b77d232d
    • B
      change desc to description (#1083) · bdad19db
      break60 提交于
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      bdad19db
    • B
      The workflow instance can be deleted only when its status is success, failure,... · 850d6bb3
      break60 提交于
      The workflow instance can be deleted only when its status is success, failure, stop and pause. (#1079)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      850d6bb3
    • T
      check processInstance state before delete worker group (#1074) · c8ee4054
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      c8ee4054
    • L
      add enterprise.wechat.enable to decide whether to send enterprise WeChat (#1081) · 162ab423
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      162ab423
    • B
      change desc to description. (#1082) · d1b115c1
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      d1b115c1
    • B
      add check user and definitions function when delete tenant (#1080) · 0fc419ed
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      0fc419ed
    • B
      Tree chart and Gantt chart style modification (#1078) · 1dcb58d7
      break60 提交于
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      1dcb58d7
    • B
      The third-party library that builds the dependency is recommended to be placed... · 9fa7c1ea
      break60 提交于
      The third-party library that builds the dependency is recommended to be placed in 'devDependencies' (#1077)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      9fa7c1ea
    • L
      fix update udf database not change and create time is changed (#1076) · 006fad4e
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      006fad4e
    • B
      Download workflow instance map width adjustment and change "desc" field to "description" (#1073) · bd73bf93
      break60 提交于
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      bd73bf93
  3. 22 10月, 2019 5 次提交
    • T
      check processInstance state before delete tenant (#1065) · 1f303675
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      1f303675
    • B
      the process cannot be terminated while tasks in the status submit success. (#1070) · 72f601cd
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      72f601cd
    • B
      Dependency workflow add dependency correction value (#1072) · 90f092f5
      break60 提交于
      90f092f5
    • B
      Modify the list field value and field length limit (#1071) · 8bb5157d
      break60 提交于
      * Solve cookie concatenation and pop-up display centering
      
      * Modify the list field value and field length limit
      8bb5157d
    • B
      1306206b
  4. 21 10月, 2019 3 次提交
    • K
      spotbugs: bug check and modify (#1018) · 26c96d8e
      khadgarmage 提交于
      * spotbugs bug check and modify
      
      * tmp var
      
      * alter third parameter
      26c96d8e
    • L
      Added a judgment on whether the currently login user is an administrator (#1064) · f250cdb0
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      f250cdb0
    • T
      fix the status message (#1063) · c4d7af92
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      c4d7af92
  5. 20 10月, 2019 2 次提交
    • T
      delete before check to avoid KeeperException$NoNodeException (#1062) · b6ab568d
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      b6ab568d
    • T
      fix the message (#1060) · 3fc9df1d
      Tboy 提交于
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      3fc9df1d
  6. 18 10月, 2019 7 次提交
    • T
      move verifyTaskInstanceIsNull after taskInstance (#1047) · 4ef2ef61
      Tboy 提交于
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      4ef2ef61
    • B
      RollBACK ans-ui (#1058) · d429bf5e
      break60 提交于
      * Delete third party import license
      
      * Resource authorization add file resource and UDF resource tab
      
      * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.
      
      * revert
      
      * Modification date format and page signature
      
      * Upgrade ANSY UI to version 0.1.46
      
      * Flink version migration
      
      * Upload file size is limited to 1G
      
      * Modify description field
      
      * RollBACK ans-ui
      d429bf5e
    • B
      Modify description field (#1057) · 2e9ff138
      break60 提交于
      * Delete third party import license
      
      * Resource authorization add file resource and UDF resource tab
      
      * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.
      
      * revert
      
      * Modification date format and page signature
      
      * Upgrade ANSY UI to version 0.1.46
      
      * Flink version migration
      
      * Upload file size is limited to 1G
      
      * Modify description field
      2e9ff138
    • B
      Upload file size is limited to 1G (#1056) · 302ecc9e
      break60 提交于
      * Delete third party import license
      
      * Resource authorization add file resource and UDF resource tab
      
      * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.
      
      * revert
      
      * Modification date format and page signature
      
      * Upgrade ANSY UI to version 0.1.46
      
      * Flink version migration
      
      * Upload file size is limited to 1G
      
      * Modify description field
      302ecc9e
    • B
      Flink version migration (#1055) · 1340ff68
      break60 提交于
      * Delete third party import license
      
      * Resource authorization add file resource and UDF resource tab
      
      * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.
      
      * revert
      
      * Modification date format and page signature
      
      * Upgrade ANSY UI to version 0.1.46
      
      * Flink version migration
      1340ff68
    • Q
      import export process define contains crontab error bug fix (#1054) · 86611989
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      86611989
    • K
      Fix ci not work for format error in .yml file (#1051) · e65d165d
      khadgarmage 提交于
      * license check whitelist 3rd.css
      
      * ci fmt
      e65d165d
  7. 17 10月, 2019 8 次提交
    • L
      fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail (#1052) · aff872a4
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      aff872a4
    • K
      license check whitelist 3rd.css (#1050) · a072b3f2
      khadgarmage 提交于
      a072b3f2
    • [BUG][#1036]repair cross-project dependency cascading exception (#1037) · 1ba7d7a8
      黄聪 提交于
      (修复跨项目流依赖级联异常)
      1ba7d7a8
    • L
      fix too many connection in upgrade or create (#1049) · 5dc8beeb
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      5dc8beeb
    • B
      Modification date format and page signature (#1048) · cd1a5c5f
      break60 提交于
      * Delete third party import license
      
      * Resource authorization add file resource and UDF resource tab
      
      * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.
      
      * revert
      
      * Modification date format and page signature
      
      * Upgrade ANSY UI to version 0.1.46
      cd1a5c5f
    • T
      fix the bug when worker execute task using queue. and remove checking Tenant... · 8eceb685
      Tboy 提交于
      fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread (#1045)
      
      8eceb685
    • B
      Solve the problem that the initial value of timing is not assigned and the... · 9fd36c98
      break60 提交于
      Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected. (#1044)
      
      * Delete third party import license
      
      * Resource authorization add file resource and UDF resource tab
      
      * Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.
      
      * revert
      9fd36c98
    • K
      github actions ci compile check (#1041) · 2cb635fe
      khadgarmage 提交于
      * github actions ci compile check
      
      * alter spelling mistake and add parameters -B
      2cb635fe