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
a855a376
Commit
a855a376
authored
Nov 15, 2021
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复perjob提交任务后报错
parent
fa487535
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
8 deletions
+12
-8
JobConfig.java
dlink-core/src/main/java/com/dlink/job/JobConfig.java
+0
-8
JobManager.java
dlink-core/src/main/java/com/dlink/job/JobManager.java
+2
-0
GatewayResult.java
...src/main/java/com/dlink/gateway/result/GatewayResult.java
+2
-0
SavePointResult.java
...c/main/java/com/dlink/gateway/result/SavePointResult.java
+5
-0
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+3
-0
No files found.
dlink-core/src/main/java/com/dlink/job/JobConfig.java
View file @
a855a376
package
com
.
dlink
.
job
;
import
com.dlink.executor.EnvironmentSetting
;
import
com.dlink.executor.Executor
;
import
com.dlink.executor.ExecutorSetting
;
import
com.dlink.gateway.config.GatewayConfig
;
import
com.dlink.session.SessionConfig
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.Map
;
/**
* JobConfig
*
...
...
@@ -88,10 +84,6 @@ public class JobConfig {
return
new
ExecutorSetting
(
checkpoint
,
parallelism
,
useSqlFragment
,
savePointPath
,
jobName
);
}
public
EnvironmentSetting
getEnvironmentSetting
(){
return
EnvironmentSetting
.
build
(
address
);
}
public
void
setSessionConfig
(
SessionConfig
sessionConfig
){
if
(
sessionConfig
!=
null
)
{
address
=
sessionConfig
.
getAddress
();
...
...
dlink-core/src/main/java/com/dlink/job/JobManager.java
View file @
a855a376
...
...
@@ -90,6 +90,7 @@ public class JobManager extends RunTime {
config
.
getGatewayConfig
().
setTaskId
(
config
.
getTaskId
());
config
.
getGatewayConfig
().
setFlinkConfig
(
FlinkConfig
.
build
(
config
.
getJobName
(),
null
,
null
,
null
,
config
.
getSavePointPath
(),
null
));
config
.
setUseRemote
(
false
);
}
}
...
...
@@ -343,6 +344,7 @@ public class JobManager extends RunTime {
InsertResult
insertResult
=
new
InsertResult
(
gatewayResult
.
getAppId
(),
true
);
job
.
setResult
(
insertResult
);
job
.
setJobId
(
gatewayResult
.
getAppId
());
job
.
setJobManagerAddress
(
gatewayResult
.
getWebURL
());
}
job
.
setEndTime
(
LocalDateTime
.
now
());
job
.
setStatus
(
Job
.
JobStatus
.
SUCCESS
);
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java
View file @
a855a376
...
...
@@ -9,4 +9,6 @@ package com.dlink.gateway.result;
public
interface
GatewayResult
{
String
getAppId
();
String
getWebURL
();
}
dlink-gateway/src/main/java/com/dlink/gateway/result/SavePointResult.java
View file @
a855a376
...
...
@@ -33,6 +33,11 @@ public class SavePointResult extends AbstractGatewayResult {
return
appId
;
}
@Override
public
String
getWebURL
()
{
return
null
;
}
public
static
SavePointResult
build
(
GatewayType
type
){
return
new
SavePointResult
(
type
,
LocalDateTime
.
now
());
}
...
...
dlink-web/src/pages/Welcome.tsx
View file @
a855a376
...
...
@@ -372,6 +372,9 @@ export default (): React.ReactNode => {
<
li
>
<
Link
>
新增集群配置管理及维护页面
</
Link
>
</
li
>
<
li
>
<
Link
>
新增 Jar 管理及维护页面
</
Link
>
</
li
>
</
ul
>
</
Paragraph
>
</
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