qiaozhanwei
2902c2e0d5
the task is abnormal and task is running bug fix ( #1143 )
...
* 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
* add Flink local mode
* ProcessDao is null bug fix
* loadAverage display problem bug fix
* MasterServer rename Server
* rollback .env
* rollback .env
* MasterServer rename Server
* the task is abnormal and task is running bug fix
5 years ago
qiaozhanwei
3b795104f2
loadAverage display problem bug fix ( #1104 )
...
* 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
* add Flink local mode
* ProcessDao is null bug fix
* loadAverage display problem bug fix
* MasterServer rename Server
* rollback .env
* rollback .env
* MasterServer rename Server
5 years ago
Tboy
fb422af732
merge api constants into common constants ( #1084 )
...
* 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
5 years ago
bao liang
0fc419ed8f
add check user and definitions function when delete tenant ( #1080 )
...
* 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
5 years ago
bao liang
72f601cda5
the process cannot be terminated while tasks in the status submit success. ( #1070 )
...
* 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
5 years ago
khadgarmage
26c96d8ed1
spotbugs: bug check and modify ( #1018 )
...
* spotbugs bug check and modify
* tmp var
* alter third parameter
5 years ago
Tboy
4ef2ef6121
move verifyTaskInstanceIsNull after taskInstance ( #1047 )
...
* 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
5 years ago
Tboy
8eceb685c9
fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread ( #1045 )
5 years ago
khadgarmage
9655174cdf
spotbugs: make map traversal more efficient ( #1035 )
...
* make map traversal more efficient
* make map traversal more efficient
modify according to review
* compile fail and delete space
5 years ago
khadgarmage
3162cccd43
license check ( #1016 )
5 years ago
bao liang
19ccd4f531
fix bug: get process definition list failed. #1026 ( #1027 )
...
* 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
5 years ago
qiaozhanwei
977ada2c8a
request url variables replace ( #1015 )
...
* 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
5 years ago
bao liang
07c4e6835e
fix bug: task cannot submit when recovery failover ( #1011 )
...
* 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
5 years ago
Tboy
dd7b1b1d0c
move updateTaskState into try/catch block in case of exception ( #1003 )
...
* move updateTaskState into try/catch block in case of exception
* fix NPE
5 years ago
qiaozhanwei
370e55fd48
ProcessDao is null bug fix ( #1004 )
...
* 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
5 years ago
lgcareer
91229993c7
change get alertDao by spring to DaoFactory ( #996 )
...
* 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
5 years ago
lgcareer
e0f53cfe57
get processDao by DaoFactory ( #994 )
...
* 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
5 years ago
qiaozhanwei
38f38457fa
remove pom package resources ( #988 )
...
* 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
5 years ago
qiaozhanwei
f125ea8335
remove application.yml file ( #983 )
...
* 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
5 years ago
bao liang
57080c96e8
update application.yml to application.properties ( #980 )
...
* 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
5 years ago
lgcareer
b9157e1d8c
Add alertDao to spring management in master ( #976 )
...
* 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
5 years ago
bao liang
6a48b98513
add multiply settings for application.yml ( #973 )
...
* 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
5 years ago
qiaozhanwei
25695ff21b
modify the package in pom to hit the resource file into the class ( #964 )
...
* 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
5 years ago
lgcareer
7e815b44ce
change escheduler to dolphinscheduler ( #963 )
...
* 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
5 years ago
qiaozhanwei
ed04835c95
running through the big process error modify ( #962 )
...
* 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
5 years ago
lgcareer
31f9fbf335
change escheduler to dolphinscheduler ( #961 )
...
* 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
5 years ago
qiaozhanwei
be59cda0da
running through the big process ( #959 )
...
* 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
5 years ago
bao liang
b5636b043f
update ut for mybatisplus ( #950 )
...
* 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
5 years ago
qiaozhanwei
12e21aa7a0
logback log name modify ( #947 )
...
* 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
5 years ago
lgcareer
60a13bf5ec
cal duration in processInstancesList ( #943 )
...
* 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
5 years ago
qiaozhanwei
d3e04c3caa
dao yml assembly to conf directory ( #942 )
...
* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
* .escheduler_env.sh to dolphinscheduler_env.sh
* dao yml assembly to conf directory
5 years ago
qiaozhanwei
070fd51145
.escheduler_env.sh to dolphinscheduler_env.sh ( #941 )
...
* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
* .escheduler_env.sh to dolphinscheduler_env.sh
5 years ago
lgcareer
0798b7d1e9
change escheduler to dolphinscheduler ( #928 )
...
* rename from DatasourceUserMapper to DataSourceUserMapper
* add unit test in UserMapper and WorkerGroupMapper
* change cn.escheduler to org.apache.dolphinscheduler
5 years ago
qiaozhanwei
d09a2d07c9
rename project and doc
5 years ago