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
a3187216
Commit
a3187216
authored
Jan 15, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复perjob的savepoint不生效问题
parent
237e05c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
StudioServiceImpl.java
...c/main/java/com/dlink/service/impl/StudioServiceImpl.java
+0
-1
JobManager.java
dlink-core/src/main/java/com/dlink/job/JobManager.java
+7
-0
No files found.
dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java
View file @
a3187216
...
@@ -27,7 +27,6 @@ import com.dlink.session.SessionConfig;
...
@@ -27,7 +27,6 @@ import com.dlink.session.SessionConfig;
import
com.dlink.session.SessionInfo
;
import
com.dlink.session.SessionInfo
;
import
com.dlink.session.SessionPool
;
import
com.dlink.session.SessionPool
;
import
com.dlink.utils.RunTimeUtil
;
import
com.dlink.utils.RunTimeUtil
;
import
com.dlink.utils.UDFUtil
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
...
...
dlink-core/src/main/java/com/dlink/job/JobManager.java
View file @
a3187216
...
@@ -35,6 +35,7 @@ import org.apache.flink.configuration.DeploymentOptions;
...
@@ -35,6 +35,7 @@ import org.apache.flink.configuration.DeploymentOptions;
import
org.apache.flink.configuration.PipelineOptions
;
import
org.apache.flink.configuration.PipelineOptions
;
import
org.apache.flink.runtime.jobgraph.JobGraph
;
import
org.apache.flink.runtime.jobgraph.JobGraph
;
import
org.apache.flink.runtime.jobgraph.SavepointConfigOptions
;
import
org.apache.flink.runtime.jobgraph.SavepointConfigOptions
;
import
org.apache.flink.runtime.jobgraph.SavepointRestoreSettings
;
import
org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions
;
import
org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions
;
import
org.apache.flink.table.api.TableResult
;
import
org.apache.flink.table.api.TableResult
;
import
org.apache.flink.yarn.configuration.YarnConfigOptions
;
import
org.apache.flink.yarn.configuration.YarnConfigOptions
;
...
@@ -253,6 +254,9 @@ public class JobManager {
...
@@ -253,6 +254,9 @@ public class JobManager {
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJar
();
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJar
();
}
else
{
}
else
{
config
.
addGatewayConfig
(
executor
.
getSetConfig
());
config
.
addGatewayConfig
(
executor
.
getSetConfig
());
if
(
Asserts
.
isNotNullString
(
config
.
getSavePointPath
()))
{
jobGraph
.
setSavepointRestoreSettings
(
SavepointRestoreSettings
.
forPath
(
config
.
getSavePointPath
()));
}
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJobGraph
(
jobGraph
);
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJobGraph
(
jobGraph
);
}
}
job
.
setResult
(
InsertResult
.
success
(
gatewayResult
.
getAppId
()));
job
.
setResult
(
InsertResult
.
success
(
gatewayResult
.
getAppId
()));
...
@@ -290,6 +294,9 @@ public class JobManager {
...
@@ -290,6 +294,9 @@ public class JobManager {
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJar
();
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJar
();
}
else
{
}
else
{
config
.
addGatewayConfig
(
executor
.
getSetConfig
());
config
.
addGatewayConfig
(
executor
.
getSetConfig
());
if
(
Asserts
.
isNotNullString
(
config
.
getSavePointPath
()))
{
jobGraph
.
setSavepointRestoreSettings
(
SavepointRestoreSettings
.
forPath
(
config
.
getSavePointPath
()));
}
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJobGraph
(
jobGraph
);
gatewayResult
=
Gateway
.
build
(
config
.
getGatewayConfig
()).
submitJobGraph
(
jobGraph
);
}
}
job
.
setResult
(
InsertResult
.
success
(
gatewayResult
.
getAppId
()));
job
.
setResult
(
InsertResult
.
success
(
gatewayResult
.
getAppId
()));
...
...
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