谌启成
e2a117032d
[Fix-3295][api] Add default value for request RequestParam ( #3341 )
2020-07-29 19:01:53 +08:00
xingchun-chen
5f725aa28b
Merge pull request #3331 from lenboo/dev-complement
...
[FIX-1336] [master] serial complement data can have multiple process instances
2020-07-29 15:37:49 +08:00
lenboo
6c2e7d74d1
merge from dev
2020-07-28 19:02:39 +08:00
lenboo
82295eea52
fix bug#1336 set start/end time before complement the next process
2020-07-28 17:57:49 +08:00
bao liang
624f0aeab9
fix bug#1336 serial complement data can have multiple process instances ( #3317 )
...
Co-authored-by: lenboo <baoliang@analysys.com.cn>
2020-07-28 11:12:51 +08:00
lenboo
39182568b2
fix bug#1336 serial complement data can have multiple process instances
2020-07-27 15:43:08 +08:00
Yichao Yang
0577dc9780
[Test-3288][server] Fix github ci unit test oom ( #3305 )
...
* [Improvement] Test github action oom
* Optimize the test case performance
* Remove the unused import
2020-07-25 19:24:16 +08:00
shi-hailong
8d70c3b7c1
Update dolphinscheduler.conf ( #3296 )
...
/ui下的资源访问不应该发送到api-server
2020-07-24 17:09:58 +08:00
tswstarplanet
5b7efd2d33
[Feature-3134]Refactor to use a shared singleton Curator Zookeeper Client ( #3244 )
...
* [Feature-3134]Refactor to use a shared singleton Curator Zookeeper Client
* autowire CuratorZookeeperClient to ZookeeperOperator
* [Improvement] Add the issue specifications reference (#3221 )
* log zookeeper address when the connect state change
* resume the operation of add connect state listener in MasterRegistry
Co-authored-by: Yichao Yang <1048262223@qq.com>
2020-07-23 11:02:30 +08:00
BoYiZhang
32e8a9d50c
[bugfix] Default JVM parameter bug ( #3212 )
...
* 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
2020-07-23 10:59:51 +08:00
t1mon
07c8193bb5
[Feature-2930][api] Displays path and host on the instance log panel. #2930 ( #3154 )
...
* Optimize PropertyUtils instantiation.
* Fix info error.
* [Feature-2930][api] Displays path and host on the instance log panel. #2930
* [update] Add log-head in download log.
* [update] clear code smell.
2020-07-23 10:57:56 +08:00
xingchun-chen
1814e22bb3
Merge pull request #3272 from break60/dev
...
[bugFix][ui]Default assignment of delete condition judgment node
2020-07-22 16:47:24 +08:00
break60
338f33413e
Default assignment of delete condition judgment node
2020-07-22 14:38:14 +08:00
xingchun-chen
aefb60a743
Merge pull request #3269 from break60/dev
...
[bugFix][ui]Fix the problem that the label of DAG creation task is not displayed,…
2020-07-22 13:57:37 +08:00
break60
339d494023
Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global
2020-07-22 13:37:10 +08:00
JinyLeeChina
0f6f138dc8
[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: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-07-22 11:50:19 +08:00
wangyanphp
ed7ac40b83
[Fix-3236][DagHelper]getFlowNodeListPost/getFlowNodeListPre time complexity O(N^N) ( #3249 )
...
* getFlowNodeListPost/getFlowNodeListPre time complexity is O(N^N); This might solve the problem
Change-Id: I07e45c831c7df0089a94a003ca8a2c07e9746892
* getFlowNodeListPost/getFlowNodeListPre time complexity is O(N^N); This might solve the problem
Change-Id: I96f5a8c0ba18656de8981f513470cfdb6bc2f467
Co-authored-by: wangyan.61 <wangyan.61@bytedance.com>
2020-07-22 11:25:42 +08:00
LEI SHENG
6f2667bf1a
[Fix-3240][worker] Cannot find a (Map) Key deserializer for type ( #3245 )
...
* fix the bug #2923 (Hive JDBC connection parameter ignored) , the hive jdbc connection url ;
* fix the bug index out of bound and add some test case
* add the Licensed
* fix the checkstyle and import StringBuilder
* put HiveDataSourceTest.java to root pom maven-surefire-plugin to avoiding the sonar 0.0% Coverage.
* Update HiveDataSource.java
* fix the bug #3240 [worker] Cannot find a (Map) Key deserializer for type
* [DS-3245][fix] change toString use JsonString
- change the method of UdfFunc.toString use JsonString
This closes #3245
* [DS-3245][fix] change toString use JsonString
- fix the junit test for full
This closes #3245
* [DS-3245][fix] change toString use JsonString
- fix the sonarcloud merge error, Swap these 2 arguments so they are in the correct order: expected value, actual value.
This closes #3245
* [DS-3245][fix] move the Class UdfFuncDeserializer to UdfFunc.java
move the class UdfFuncDeserializer.java to UdfFunc.java
This closes #3245
* [DS-3245][fix] move the Class UdfFuncDeserializer to UdfFunc.java
add blank line
This closes #3245
* [DS-3245][fix] add the unit test of UdfFunc
add the unit test of UdfFunc.java
This closes #3245
* [DS-3245][fix] add the unit test of UdfFunc
remove the UdfFuncTest.java from maven-surefire-plugin list
This closes #3245
* [DS-3245][fix] add the unit test of UdfFunc
add the UdfFuncTest to the root pom maven-surefire-plugin
This closes #3245
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-21 18:54:07 +08:00
xingchun-chen
252abbdaed
Merge pull request #3261 from break60/dev
...
[bugFix][ui] When modifying the dag, if the DAG is not saved, it cannot be formatted
2020-07-21 18:02:47 +08:00
break60
1c16c4f968
When modifying the dag, if the DAG is not saved, it cannot be formatted
2020-07-21 17:42:58 +08:00
xingchun-chen
d1878ac1d7
Merge pull request #3259 from break60/dev
...
[bugfix #3045 ][ui]Delete the pid of the master and worker processes
2020-07-21 17:29:01 +08:00
break60
52fe78a83f
Delete the pid of the master and worker processes
2020-07-21 13:53:37 +08:00
xingchun-chen
e03f1e2dbe
Merge pull request #3255 from break60/dev
...
[bugFix][ui]Click Cancel, the node data is restored to the original data
2020-07-21 13:51:50 +08:00
break60
edf1115f16
fix
2020-07-21 10:22:20 +08:00
break60
8d66fa171e
Note e2e timing
2020-07-21 09:47:08 +08:00
break60
cca7860765
Click Cancel, the node data is restored to the original data
2020-07-21 09:29:57 +08:00
break60
854e241b45
Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
2020-07-21 09:23:07 +08:00
break60
a03d5483a8
[Feature-3223][ui]Click DAG connection to add label function ( #3224 )
...
* Click DAG connection to add label function
2020-07-21 09:21:53 +08:00
break60
d9b7839ef4
fix
2020-07-20 18:15:50 +08:00
break60
217e7f6e1e
Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
2020-07-20 08:51:59 +08:00
Yichao Yang
8ba3620710
[Improvement] Add the issue specifications reference ( #3221 )
2020-07-20 07:24:12 +08:00
break60
a3a7e22cc2
fix
2020-07-17 17:52:57 +08:00
break60
353379d420
Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
2020-07-17 17:52:27 +08:00
xingchun-chen
1b54c76ed8
[test-2995][e2e]add rerun workflow and optimize testCase ( #3220 )
...
* add LoginTest license
* Delete useless packages
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group
* Increase dataX environment variable, sslTrust default value
* modify dataX environment variable
* update e2e chrome version
* add alert manage testcase and Optimize test case execution order
* add e2e to create and to edit queue
* update e2e chrome version
* add e2e token testcase
* add e2e token testcase
* add e2e to run workflow testcase
* add e2e timing testcase
* add e2e timing testcase
* add e2e timing testcase
* add e2e timing testcase
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* edit user
* edit user
* edit user
* edit user
* edit user
* Update TimingLocator.java
* modify ci log
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify artifact version
* Update ci_e2e.yml
* Update ci_e2e.yml
modify /var/lib/docker/volumes permissions
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
Modify log file permissions
* Update ci_e2e.yml
modify logs
* Update ci_e2e.yml
modify logs
* Update ci_e2e.yml
modify logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* Update ci_e2e.yml
modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* Update ci_e2e.yml
modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify tenant
* modify alert wait time
* modify queue wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify button xpath
* modify queue xpath
* Ignore edit user
* modify alert wait time
* print delete user log
* modify the xpath of delete user button
* modify timing wait time
* add process instance
* add process instance
* modify timing wait time
* modify rerun assert
* modify alert wait time
* Optimize test cases
Co-authored-by: chenxingchun <438044805@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-17 17:04:28 +08:00
amenglu
178d8f829a
Update MasterSchedulerService.java ( #3226 )
2020-07-17 16:54:52 +08:00
hcz
50fcc492c1
Fix typo ( #3230 )
2020-07-17 14:26:46 +08:00
break60
e654a59d52
Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
2020-07-17 09:14:46 +08:00
rockxsj
b6a0d55949
fix and update k8s deploy ( #3215 )
...
* Modify the AWS S3 request encryption method to V4.
* * update Dockerfile to add mysql-client for mysql database service test
* update wechat alert config replace placeholder from to {xx} because of the will be treat as env variable
* fix unit test of EnterpriseWeChatUtilsTest
* update values.yaml default config for helm deploy DS cluster
* update values.yaml default config for custom install
* update templates of helm for custom install
* update some name of env varibale, for example change from POSTGRESQL_HOST to DATABASE_HOST
* delele the redundancy requirements.yaml for heml
* update README* in the docker dir and subdir
* update startup scripts for support mysql as backend database
* * fix the ENV name wrong in docker-compose.yml and docker-stack.yml
* remove the didn't need port mapping in postgresql & zookeeper & dolphinscheduler-api
* * keep expose the port of postgresql & zk & api because of unit test needed
* * remove mysql-client package from dockerfile
Co-authored-by: rockxsj <junjun@mgtv.com>
2020-07-16 16:36:29 +08:00
muzhongjiang
3aa34bc723
[bugfix] "getNotifyGroupList" cache bug #3179 ( #3200 )
...
* add state
* fixed bug "jackson enum conversion : InvalidFormatException"
* Word spelling modification
Comment modification
Word spelling modification,Comment modification,Log level modification
* Update EmailManager.java
* Update FlinkParameters.java
* Update SqlTask.java
* fixed "getNotifyGroupList cache" bug
Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-16 14:56:53 +08:00
break60
31cdfc4ded
fix
2020-07-16 14:35:18 +08:00
break60
a5c85cb056
Click DAG connection to add label function
2020-07-16 13:47:22 +08:00
Rubik-W
a7aa58e6ca
Feature add user state ( #2710 )
...
* feature: #1923
* fix：docker sql script add column
* fix: update sql script
* fix: UT bug
* fix: UT bug
* fix: UT bug
* fix: e2e UT bug
* fix: e2e button location
* fix：sql init script to add t_ds_user.state column
Co-authored-by: Rubik-W <whm_777@163.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-07-15 11:21:38 +08:00
BoYiZhang
c453a5bd4c
dag add close buttion ( #3195 )
...
* 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
2020-07-15 10:46:54 +08:00
johnnygo920
1dfde72452
[BUG#2359][Alert] Mail Chinese name is too long garbled ( #3199 )
...
* 解决中文附件名过长时邮件附件中文乱码问题
* Solve the problem of messy Chinese name in excel attachment
* SonarCloud Code Analysis is not running . retry commit
* Update MailUtils.java
Co-authored-by: johnnygo920 <W@ngchen2020>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-14 23:22:42 +08:00
zhangchunyang
438a009a3e
resolve #3096 fixbug ambari plugin the config options which has unit doesnt write unit into config file ( #3209 )
...
Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>
2020-07-14 16:11:54 +08:00
xingchun-chen
e97b4707a5
[Test-2995][e2e] run workflow and timing testCase ( #3201 )
...
* add LoginTest license
* Delete useless packages
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group
* Increase dataX environment variable, sslTrust default value
* modify dataX environment variable
* update e2e chrome version
* add alert manage testcase and Optimize test case execution order
* add e2e to create and to edit queue
* update e2e chrome version
* add e2e token testcase
* add e2e token testcase
* add e2e to run workflow testcase
* add e2e timing testcase
* add e2e timing testcase
* add e2e timing testcase
* add e2e timing testcase
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
# e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
* edit user
* edit user
* edit user
* edit user
* edit user
* Update TimingLocator.java
* modify ci log
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
modify artifact version
* Update ci_e2e.yml
* Update ci_e2e.yml
modify /var/lib/docker/volumes permissions
* Update ci_e2e.yml
modify ci logs
* Update ci_e2e.yml
Modify log file permissions
* Update ci_e2e.yml
modify logs
* Update ci_e2e.yml
modify logs
* Update ci_e2e.yml
modify logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* Update ci_e2e.yml
modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* Update ci_e2e.yml
modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify ci logs
* modify tenant
* modify alert wait time
* modify queue wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify alert wait time
* modify button xpath
* modify queue xpath
* Ignore edit user
* modify alert wait time
* print delete user log
* modify the xpath of delete user button
* modify timing wait time
Co-authored-by: chenxingchun <438044805@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-14 11:48:13 +08:00
CalvinKirs
38e7494f78
replace CollectionUtils deprecated method ( #3027 )
...
* replace deprecated method
* replace deprecated method
* replace deprecated method
* replace deprecated method
* replace deprecated method
* messy
* messy
* messy
* add missing license
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-13 19:42:33 +08:00
tswstarplanet
753ed58fb9
[Bug-3140]fix the deadlock between start and stop of ZKServer ( #3141 )
...
* [Bug-3140]fix the deadlock between start and stop of ZKServer
* use Log framework to print information
* fix code smells; add path prefix of embedded zk server
* Update dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
Co-authored-by: Yichao Yang <1048262223@qq.com>
* optimize the code
Co-authored-by: Yichao Yang <1048262223@qq.com>
2020-07-13 18:52:33 +08:00
CalvinKirs
6f9970b189
[Feature-2574][Server]Specify Network Interface ( #3186 )
...
* [Feature-2574][Server]Specify Network Interface
This closes #2574
* code smell
* code smell
* move DOLPHIN_SCHEDULER_PREFERRED_NETWORK_INTERFACE to Constants.java
2020-07-13 18:51:38 +08:00
wuchunfu
6c9ac84f73
[PROPOSAL-3139] Datasource selection changes from radio to select ( #3142 )
...
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-13 17:31:49 +08:00
