Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
6bd960ef
Commit
6bd960ef
authored
Nov 11, 2021
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同步前后台配置名
parent
2ad682bf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
8 deletions
+17
-8
ClusterConfig.java
...src/main/java/com/dlink/gateway/config/ClusterConfig.java
+5
-5
GatewayConfig.java
...src/main/java/com/dlink/gateway/config/GatewayConfig.java
+2
-2
YarnGateway.java
...way/src/main/java/com/dlink/gateway/yarn/YarnGateway.java
+1
-1
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+9
-0
No files found.
dlink-gateway/src/main/java/com/dlink/gateway/config/ClusterConfig.java
View file @
6bd960ef
...
@@ -13,19 +13,19 @@ import lombok.Setter;
...
@@ -13,19 +13,19 @@ import lombok.Setter;
@Setter
@Setter
public
class
ClusterConfig
{
public
class
ClusterConfig
{
private
String
flinkConfigPath
;
private
String
flinkConfigPath
;
private
String
flinkLib
s
;
private
String
flinkLib
Path
;
private
String
yarnConfigPath
;
private
String
yarnConfigPath
;
public
ClusterConfig
()
{
public
ClusterConfig
()
{
}
}
public
ClusterConfig
(
String
flinkConfigPath
,
String
flinkLib
s
,
String
yarnConfigPath
)
{
public
ClusterConfig
(
String
flinkConfigPath
,
String
flinkLib
Path
,
String
yarnConfigPath
)
{
this
.
flinkConfigPath
=
flinkConfigPath
;
this
.
flinkConfigPath
=
flinkConfigPath
;
this
.
flinkLib
s
=
flinkLibs
;
this
.
flinkLib
Path
=
flinkLibPath
;
this
.
yarnConfigPath
=
yarnConfigPath
;
this
.
yarnConfigPath
=
yarnConfigPath
;
}
}
public
static
ClusterConfig
build
(
String
flinkConfigPath
,
String
flinkLib
s
,
String
yarnConfigPath
){
public
static
ClusterConfig
build
(
String
flinkConfigPath
,
String
flinkLib
Path
,
String
yarnConfigPath
){
return
new
ClusterConfig
(
flinkConfigPath
,
flinkLib
s
,
yarnConfigPath
);
return
new
ClusterConfig
(
flinkConfigPath
,
flinkLib
Path
,
yarnConfigPath
);
}
}
}
}
dlink-gateway/src/main/java/com/dlink/gateway/config/GatewayConfig.java
View file @
6bd960ef
...
@@ -44,8 +44,8 @@ public class GatewayConfig {
...
@@ -44,8 +44,8 @@ public class GatewayConfig {
if
(
para
.
has
(
"flinkConfigPath"
))
{
if
(
para
.
has
(
"flinkConfigPath"
))
{
config
.
getClusterConfig
().
setFlinkConfigPath
(
para
.
get
(
"flinkConfigPath"
).
asText
());
config
.
getClusterConfig
().
setFlinkConfigPath
(
para
.
get
(
"flinkConfigPath"
).
asText
());
}
}
if
(
para
.
has
(
"flinkLib
s
"
))
{
if
(
para
.
has
(
"flinkLib
Path
"
))
{
config
.
getClusterConfig
().
setFlinkLib
s
(
para
.
get
(
"flinkLibs
"
).
asText
());
config
.
getClusterConfig
().
setFlinkLib
Path
(
para
.
get
(
"flinkLibPath
"
).
asText
());
}
}
if
(
para
.
has
(
"yarnConfigPath"
))
{
if
(
para
.
has
(
"yarnConfigPath"
))
{
config
.
getClusterConfig
().
setYarnConfigPath
(
para
.
get
(
"yarnConfigPath"
).
asText
());
config
.
getClusterConfig
().
setYarnConfigPath
(
para
.
get
(
"yarnConfigPath"
).
asText
());
...
...
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnGateway.java
View file @
6bd960ef
...
@@ -63,7 +63,7 @@ public abstract class YarnGateway extends AbstractGateway {
...
@@ -63,7 +63,7 @@ public abstract class YarnGateway extends AbstractGateway {
if
(
Asserts
.
isNotNullString
(
config
.
getFlinkConfig
().
getSavePoint
()))
{
if
(
Asserts
.
isNotNullString
(
config
.
getFlinkConfig
().
getSavePoint
()))
{
configuration
.
setString
(
SavepointConfigOptions
.
SAVEPOINT_PATH
,
config
.
getFlinkConfig
().
getSavePoint
());
configuration
.
setString
(
SavepointConfigOptions
.
SAVEPOINT_PATH
,
config
.
getFlinkConfig
().
getSavePoint
());
}
}
configuration
.
set
(
YarnConfigOptions
.
PROVIDED_LIB_DIRS
,
Collections
.
singletonList
(
config
.
getClusterConfig
().
getFlinkLib
s
()));
configuration
.
set
(
YarnConfigOptions
.
PROVIDED_LIB_DIRS
,
Collections
.
singletonList
(
config
.
getClusterConfig
().
getFlinkLib
Path
()));
configuration
.
set
(
YarnConfigOptions
.
APPLICATION_NAME
,
config
.
getFlinkConfig
().
getJobName
());
configuration
.
set
(
YarnConfigOptions
.
APPLICATION_NAME
,
config
.
getFlinkConfig
().
getJobName
());
YarnLogConfigUtil
.
setLogConfigFileInConfig
(
configuration
,
config
.
getClusterConfig
().
getFlinkConfigPath
());
YarnLogConfigUtil
.
setLogConfigFileInConfig
(
configuration
,
config
.
getClusterConfig
().
getFlinkConfigPath
());
}
}
...
...
dlink-web/src/pages/Welcome.tsx
View file @
6bd960ef
...
@@ -363,6 +363,15 @@ export default (): React.ReactNode => {
...
@@ -363,6 +363,15 @@ export default (): React.ReactNode => {
<
li
>
<
li
>
<
Link
>
更新 dlink 的 flink 主版本号为 1.13.3
</
Link
>
<
Link
>
更新 dlink 的 flink 主版本号为 1.13.3
</
Link
>
</
li
>
</
li
>
<
li
>
<
Link
>
新增 yarn-application 的作业提交方式
</
Link
>
</
li
>
<
li
>
<
Link
>
新增 yarn-perjob 的作业提交方式
</
Link
>
</
li
>
<
li
>
<
Link
>
新增集群配置管理及维护页面
</
Link
>
</
li
>
</
ul
>
</
ul
>
</
Paragraph
>
</
Paragraph
>
</
Timeline
.
Item
>
</
Timeline
.
Item
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment