Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

migrate to airflow scheduler (closed. pls see https://github.com/WeBankFinTech/DataSphereStudio/pull/273) #241

Closed
wants to merge 113 commits into from
Closed

migrate to airflow scheduler (closed. pls see https://github.com/WeBankFinTech/DataSphereStudio/pull/273) #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
484b645
add workspace router
det101 Jun 19, 2020
c910332
Merge branch 'master' of https://github.com/det101/DataSphereStudio
det101 Jun 19, 2020
3e089e0
Merge branch 'master' of https://github.com/det101/DataSphereStudio
det101 Jun 22, 2020
4186883
add workspace featrue
det101 Jun 22, 2020
26625dd
add devserve config & clear debug
det101 Jun 27, 2020
f0a6402
add i18n
det101 Jun 27, 2020
c71edda
icon support color
det101 Jun 27, 2020
47e9454
fixed #176
det101 Jun 27, 2020
84156a8
admin button url
det101 Jun 27, 2020
5abf908
Merge pull request #180 from det101/master
Adamyuanyuan Jun 28, 2020
7ee8338
fix conflicts
yuchenyao Jun 29, 2020
73097c0
Merge branch 'WeBankFinTech-dev-0.9.0' into dev-0.9.0
yuchenyao Jun 29, 2020
34b75c3
表格国际化
yuchenyao Jun 29, 2020
264ea25
Merge pull request #5 from WeBankFinTech/dev-0.9.0
det101 Jun 30, 2020
6eb2d22
Merge pull request #2 from WeBankFinTech/dev-0.9.0
Adamyuanyuan Jun 30, 2020
cca8725
Merge pull request #184 from yuchenyao/dev-0.9.0
Adamyuanyuan Jun 30, 2020
d18a6a7
Merge pull request #3 from WeBankFinTech/dev-0.9.0
Adamyuanyuan Jun 30, 2020
e35820f
api field change
det101 Jun 30, 2020
4b1c9e8
Merge pull request #6 from WeBankFinTech/dev-0.9.0
det101 Jun 30, 2020
c9d769b
Merge branch 'master' of https://github.com/det101/DataSphereStudio
det101 Jun 30, 2020
4dadcfe
add workspace favorites and resolve conflicts
Adamyuanyuan Jun 30, 2020
6803bc7
fix search result not work
det101 Jul 1, 2020
7a7f781
change workscpace create api
det101 Jul 1, 2020
a3a015d
Fixed Python result set not showing
zwx-master Jun 29, 2020
4fbad15
change version
zwx-master Jun 29, 2020
e22310b
Workflow selection script executable
zwx-master Jul 1, 2020
175ccfe
Merge pull request #9 from WeBankFinTech/dev-0.9.0
zwx-master Jul 1, 2020
52ab2fb
Repair repeat progress is zero
zwx-master Jul 1, 2020
bdb36f0
Merge pull request #188 from Adamyuanyuan/master
Adamyuanyuan Jul 1, 2020
cbfb0e0
Merge pull request #3 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 1, 2020
31d1dea
Merge pull request #1 from WeBankFinTech/dev-0.9.0
schumiyi Jul 2, 2020
3de5916
fix #193. Replace DWS with DSS
Adamyuanyuan Jul 2, 2020
10798d2
optimize the display
det101 Jul 2, 2020
5b3acf6
修复列表展示tag的缺陷，描述过长加省略，单击该行跳转到工作空间
yuchenyao Jul 2, 2020
700396c
Merge pull request #194 from Adamyuanyuan/master
Adamyuanyuan Jul 2, 2020
4676738
修改国际化内容
yuchenyao Jul 2, 2020
9acc4a5
Merge pull request #4 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 2, 2020
6cdaebc
Merge branch 'dev-0.9.0' of https://github.com/yuchenyao/DataSphereSt…
yuchenyao Jul 2, 2020
8600075
Optimization of view logic
det101 Jul 2, 2020
c46f933
merge
det101 Jul 2, 2020
907d7e8
Merge branch 'dev-0.9.0' of git://github.com/WeBankFinTech/DataSphere…
det101 Jul 2, 2020
9058c0f
Update dss_dml.sql
Jul 2, 2020
9f0c442
Merge branch 'WeBankFinTech-dev-0.9.0'
det101 Jul 2, 2020
e0fedda
Merge pull request #2 from WeBankFinTech/dev-0.9.0
schumiyi Jul 2, 2020
039ce1d
Merge pull request #189 from det101/master
Adamyuanyuan Jul 2, 2020
aa0ee94
Merge pull request #195 from ryanqin01/dev-0.9.0
Adamyuanyuan Jul 2, 2020
ce51c0a
改造工程页
yuchenyao Jul 2, 2020
590d135
Merge pull request #5 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 2, 2020
4916b86
Merge branch 'dev-0.9.0' of https://github.com/yuchenyao/DataSphereSt…
yuchenyao Jul 2, 2020
ce0cdd9
bugfix: fix getMenuAppInstances with EN
Jul 3, 2020
670636a
screen adaptation
det101 Jul 3, 2020
79daacb
Update dss_dml.sql
Jul 3, 2020
6298f8e
查询、创建带上workspaceId
yuchenyao Jul 3, 2020
b864d19
Merge pull request #199 from yuchenyao/dev-0.9.0
Adamyuanyuan Jul 3, 2020
14d43b9
Merge pull request #198 from ryanqin01/dev-0.9.0
Adamyuanyuan Jul 3, 2020
b614728
Merge pull request #197 from det101/master
Adamyuanyuan Jul 3, 2020
7875b07
Merge pull request #196 from schumiyi/dev-0.9.0
Adamyuanyuan Jul 3, 2020
9fef375
Merge pull request #8 from WeBankFinTech/dev-0.9.0
det101 Jul 3, 2020
085aaad
修改workspaceId 传参格式
yuchenyao Jul 3, 2020
42d6dd0
add workspaceId when add project and select tree
Adamyuanyuan Jul 3, 2020
ea607c4
Merge pull request #8 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 3, 2020
c089239
Merge branch 'dev-0.9.0' of https://github.com/yuchenyao/DataSphereSt…
yuchenyao Jul 3, 2020
8e38cdd
supplement copyright
Adamyuanyuan Jul 3, 2020
9c1a1a4
定义video pageSize
yuchenyao Jul 3, 2020
4083f0c
exclude dependency in assembly for package
Adamyuanyuan Jul 3, 2020
d8e59f0
Merge pull request #200 from yuchenyao/dev-0.9.0
Adamyuanyuan Jul 3, 2020
1e85b0a
Merge pull request #201 from Adamyuanyuan/master
Adamyuanyuan Jul 4, 2020
d20fe4f
Merge pull request #192 from zwx-master/master
Adamyuanyuan Jul 4, 2020
3aa23d7
fix delect FavoriteApp error. key error
det101 Jul 6, 2020
72a3568
destroy event
det101 Jul 6, 2020
db49b37
delete mock data
det101 Jul 6, 2020
decb05a
Merge pull request #3 from WeBankFinTech/dev-0.9.0
schumiyi Jul 6, 2020
4469b03
add login captcha
det101 Jul 6, 2020
3669162
favoriteApp must active status
det101 Jul 6, 2020
3cb5ede
fix tag wrap style
det101 Jul 6, 2020
1ef8af6
Merge pull request #202 from det101/master
Adamyuanyuan Jul 6, 2020
c3f8528
国际化修复
yuchenyao Jul 6, 2020
a5e155d
Merge pull request #9 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 6, 2020
0d55276
Merge branch 'dev-0.9.0' of https://github.com/yuchenyao/DataSphereSt…
yuchenyao Jul 6, 2020
db8c45c
Merge pull request #203 from yuchenyao/dev-0.9.0
Adamyuanyuan Jul 8, 2020
90f2099
Merge pull request #4 from WeBankFinTech/dev-0.9.0
schumiyi Jul 8, 2020
0534ace
modify DDL and DML for DSS
Jul 8, 2020
367b5c2
bugfix: variable has the same name with ClassDef
Jul 8, 2020
c7e0bfb
Merge pull request #205 from schumiyi/dev-0.9.0
Adamyuanyuan Jul 8, 2020
4ed9a57
Merge pull request #4 from WeBankFinTech/dev-0.9.0
Adamyuanyuan Jul 8, 2020
0d4faef
captcha lowercase
det101 Jul 8, 2020
3305eaa
Merge remote-tracking branch 'remotes/upstream/master'
det101 Jul 8, 2020
f20f901
update pom to 0.9.0
det101 Jul 8, 2020
b54ae90
Merge pull request #5 from WeBankFinTech/dev-0.9.0
schumiyi Jul 8, 2020
a8b290d
Merge pull request #207 from det101/master
Adamyuanyuan Jul 8, 2020
fe682fd
Merge pull request #11 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 10, 2020
91b3f3c
Merge pull request #6 from WeBankFinTech/dev-0.9.0
schumiyi Jul 10, 2020
04fcff8
bugfix: fix bug related to reconstruct
Jul 10, 2020
775feec
Merge pull request #209 from schumiyi/dev-0.9.0
Adamyuanyuan Jul 10, 2020
795d53e
Calculate the width of child elements to fit the screen
yuchenyao Jul 10, 2020
4b13bbd
Merge pull request #211 from yuchenyao/dev-0.9.0
Adamyuanyuan Jul 10, 2020
a43d6c8
Merge pull request #12 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 10, 2020
b55716f
set fixed width to workspaceItem to fit the screen
yuchenyao Jul 10, 2020
11a7d12
Merge pull request #212 from yuchenyao/dev-0.9.0
Adamyuanyuan Jul 10, 2020
97f1bef
Merge pull request #7 from WeBankFinTech/dev-0.9.0
schumiyi Jul 13, 2020
c1750c2
change sql for workspace
Jul 13, 2020
d5ef69b
Merge pull request #213 from schumiyi/dev-0.9.0
Adamyuanyuan Jul 13, 2020
ec1685d
modify i18n en.json
yuchenyao Jul 13, 2020
8531723
Merge pull request #14 from WeBankFinTech/dev-0.9.0
yuchenyao Jul 13, 2020
69dbcb1
title style change
det101 Jul 13, 2020
a8aeb06
Merge pull request #215 from det101/master
Adamyuanyuan Jul 13, 2020
4ce9363
Merge pull request #214 from yuchenyao/dev-0.9.0
Adamyuanyuan Jul 13, 2020
0413408
add dss 0.9.0 upgrade notes
Adamyuanyuan Jul 13, 2020
f4456c9
Merge pull request #216 from Adamyuanyuan/master
Adamyuanyuan Jul 13, 2020
b7ed704
Merge pull request #208 from WeBankFinTech/dev-0.9.0
wushengyeyouya Jul 13, 2020
85c5faf
migrate to airflow scheduler
Oct 18, 2020
388e0e8
feat(airflow scheduler appjoint): disable airflow scheduler by default
Dec 24, 2020
c56b3f8
feat(airflow scheduler appjoint): disable airflow scheduler by default
Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -9,15 +9,18 @@ dss-appjoint-auth/target/
dss-appjoint-core/target/
dss-appjoint-loader/target/
dss-application/target/
dss-airflow-scheduler-appjoint/target/
dss-azkaban-scheduler-appjoint/target/
dss-common/target/
dss-flow-execution-entrance/target/
dss-linkis-node-execution/target/
dss-scheduler-appjoint-core/target/
dss-server/target/
eventchecker-appjoint/target/
plugins/airflow/linkis-airflow-client/target/
plugins/azkaban/linkis-jobtype/target/
plugins/linkis/linkis-appjoint-entrance/target/

sendemail-appjoint/sendemail-core/target/
visualis-appjoint/appjoint/target/
visualis-appjoint/appjoint/target/
qualitis-appjoint/appjoint/target/
2 changes: 1 addition & 1 deletion assembly/pom.xml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.8.0</version>
<version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
1 change: 1 addition & 0 deletions assembly/src/main/assembly/assembly.xml
View file
Open in desktop
Expand Up @@ -115,6 +115,7 @@
<fileSet>
<directory>
${project.parent.basedir}/dss-azkaban-scheduler-appjoint/target/
<!-- ${project.parent.basedir}/dss-airflow-scheduler-appjoint/target/ -->
</directory>
<outputDirectory>share/appjoints/schedulis</outputDirectory>
<includes>
Expand Down