Commit Graph

36 Commits

Author SHA1 Message Date
xiagw
8c47dcb694
fix: use shellformat(shfmt) and shellcheck fix mvnw (#3692)
use shellformat(shfmt) and shellcheck fix mvnw
2021-01-15 21:30:47 +08:00
Yarlung
bd156b312d
[Improvement-3933][db operation] Improve the performance of sql query (#3940)
* optimize select * case

* emove redundancy

* bug fixed

* Update en_US.js

* Update startup.sh

* optimize

* optimize code

* optimize

* bug fixed

* add ut

* bug fixed

* bug fixed

* bug fixed

* bug fixed

* Delete WorkFlowLineageMapper.xml

* Delete createTenement.vue

* recove wrongly deleted file

* Update WorkFlowLineageMapper.xml

* Update createTenement.vue
2020-11-28 21:41:00 +08:00
baoliang
381d23ea4f merge from 1.3.3-release 2020-11-06 00:03:20 +08:00
spring-bu
3fdc5576e1
[Fix][Docker] fix startup.sh variables cannot reference in single quotes. (#3895)
* [Fix][Docker] fix startup.sh variables cannot reference in single quotes.(#3894)

Signed-off-by: YoungMan <bushengquan@gmail.com>

* Update Dockerfile

update the  comment
and delete the maridb client

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-10-17 21:57:16 +08:00
lgcareer
09bdd99004
[Fix-3124][docker]Fix that can not build a docker image on windows (#3765) 2020-09-22 10:04:26 +08:00
lgcareer
25bf49b074 [Fix-3238][docker]Fix that can not create folder in docker with standalone mode 2020-09-21 10:26:42 +08:00
lgcareer
1c07892fea
[Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741) 2020-09-17 11:36:25 +08:00
xiagw
93bc5c0081
fix:Dockerfile user apk --no-cache (#3691)
Dockerfile use apk --no-cache
Dockerfile use COPY replace ADD
2020-09-16 14:43:39 +08:00
geosmart
6dc8b4f0a3
add 4lw.commands.whitelist for ds monitor (#3664)
update docker zoo.cfg 
--
add config to enable dolphinscheuler monitor data
```
#Four Letter Words commands:stat,ruok,conf,isro
4lw.commands.whitelist=*
```
if without this config,the monitor data is all  default value -1
2020-09-05 16:32:19 +08:00
Yichao Yang
fe9967b005
[Improvement-3369][api] Introduce ProjectService interface for more clear code (#3384)
* [Improvement][api] Introduce ProjectService interface for more clear code

* Fix ci e2e

* Update ProcessDefinitionServiceTest.java
2020-08-16 12:36:25 +08:00
Yichao Yang
eefb0bf031 [Hotfix][ci] Fix e2e ci docker image build error 2020-08-15 20:35:04 +08:00
CalvinKirs
d6a32ac652
[Feature#3234][cluster]enhanced load balancing (#3235)
* [Future#3234][cluster]enhanced load balancing
weight-based load balancing algorithm
this close # 3234

* remove useless parameter

* code smell

* load balancing according to work group

* add smooth weight round robin

* remove unused constants

* perfect unit test

* code smell

* code smell

* add work weight config

* fix config error

* add weight docs to readme.md
2020-08-10 19:05:21 +08:00
rockxsj
232a24441b
* add ZOOKEEPER_ROOT env in k8s deploy (#3260)
Co-authored-by: rockxsj <junjun@mgtv.com>
2020-08-10 15:16:19 +08:00
shi-hailong
8d70c3b7c1
Update dolphinscheduler.conf (#3296)
/ui下的资源访问不应该发送到api-server
2020-07-24 17:09:58 +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
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
gaojun2048
58897aa2c5 merge 1.3.0-release branch code 2020-06-29 18:42:26 +08:00
gaojun2048
3cf9afc195 merge 1.3.0-release branch code 2020-06-29 18:42:18 +08:00
tlhhup
eafd640163 Zookeeper management interface in monitoring center displays abnormal #2547 (#2595)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-29 17:39:07 +08:00
liwenhe1993
78f2fe253e Modify docker-compose and kubernetes config
1. Move kubernetes to docker directory
2. Change docker-compose directory's name, and move docker-compose to docker directory
3. Modify docker-compose config and kubernetes config
4. Modify startup.sh in dockerfile
2020-06-29 17:38:58 +08:00
xingchun-chen
3b15a9a7f5 Update worker_group_id to worker_group (#2433)
* 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

Co-authored-by: chenxingchun <438044805@qq.com>
2020-06-29 17:38:36 +08:00
qiaozhanwei
de3bf1b35d init.sql modify 2020-06-29 17:38:24 +08:00
qiaozhanwei
0294b2898a postgresql init.sql modify 2020-06-29 17:38:22 +08:00
khadgarmage
416e0417ad license and checkoutv2 fix (#2261) 2020-06-29 17:36:29 +08:00
xiaochun.liu
c68785632f merge from dev-1.3.0 2020-05-13 23:31:36 +08:00
Rubik-W
68e3487e34
feature: Add user state #1923 (#2424)
* 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

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-11 11:45:29 +08:00
tlhhup
c3353c2b5e
Zookeeper management interface in monitoring center displays abnormal #2547 (#2595)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-06 13:56:05 +08:00
liwenhe1993
4f9d8caeed
Use docker-compose for deployment . Failed to execute python script (#2539)
* Modify docker-compose and dockerfile

1. Add python3 in Dockerfile
2. Modify startup.sh file
3. Modify docker-compose.yml and add docker-stack.yml
4. Modify dolphinscheduler_env.sh

* Add logback-xx.xml and Modify Dockerfile
2020-04-27 16:18:21 +08:00
liwenhe1993
7eecfe45ea Modify docker-compose and kubernetes config
1. Move kubernetes to docker directory
2. Change docker-compose directory's name, and move docker-compose to docker directory
3. Modify docker-compose config and kubernetes config
4. Modify startup.sh in dockerfile
2020-04-26 14:13:07 +08:00
xingchun-chen
347f05f08c
Update worker_group_id to worker_group (#2433)
* 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

Co-authored-by: chenxingchun <438044805@qq.com>
2020-04-15 18:30:31 +08:00
qiaozhanwei
3b56ae2f82 init.sql modify 2020-04-09 22:43:04 +08:00
qiaozhanwei
46dbacef25 init.sql modify 2020-04-09 22:18:50 +08:00
qiaozhanwei
62661f0f28 init.sql modify 2020-04-09 21:38:23 +08:00
qiaozhanwei
d4ad23dd46 postgresql init.sql modify 2020-04-09 14:00:34 +08:00
khadgarmage
cddf803ba0
license and checkoutv2 fix (#2261) 2020-03-21 20:23:13 +08:00
khadgarmage
5f4146eb4e prepare db env for ut mapper test (#1581)
* docker compose db

* docker compose db

* docker compose db

* docker compose db

* delete init
2019-12-26 10:23:35 +08:00