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
0d80b4ee
Commit
0d80b4ee
authored
Apr 06, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Feature-355][admin,executor] Restore the job from a savepoint path in remote mode
parent
a16d9282
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
6 deletions
+65
-6
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+5
-0
AppBatchExecutor.java
...or/src/main/java/com/dlink/executor/AppBatchExecutor.java
+10
-1
AppStreamExecutor.java
...r/src/main/java/com/dlink/executor/AppStreamExecutor.java
+10
-1
LocalBatchExecutor.java
.../src/main/java/com/dlink/executor/LocalBatchExecutor.java
+10
-1
LocalStreamExecutor.java
...src/main/java/com/dlink/executor/LocalStreamExecutor.java
+10
-1
RemoteBatchExecutor.java
...src/main/java/com/dlink/executor/RemoteBatchExecutor.java
+10
-1
RemoteStreamExecutor.java
...rc/main/java/com/dlink/executor/RemoteStreamExecutor.java
+10
-1
No files found.
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
0d80b4ee
package
com
.
dlink
.
service
.
impl
;
import
org.apache.flink.runtime.jobgraph.SavepointConfigOptions
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.dlink.alert.Alert
;
import
com.dlink.alert.AlertConfig
;
...
...
@@ -526,15 +528,18 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Savepoints
latestSavepoints
=
savepointsService
.
getLatestSavepointByTaskId
(
task
.
getId
());
if
(
Asserts
.
isNotNull
(
latestSavepoints
))
{
config
.
setSavePointPath
(
latestSavepoints
.
getPath
());
config
.
getConfig
().
put
(
SavepointConfigOptions
.
SAVEPOINT_PATH
.
key
(),
latestSavepoints
.
getPath
());
}
break
;
case
EARLIEST:
Savepoints
earliestSavepoints
=
savepointsService
.
getEarliestSavepointByTaskId
(
task
.
getId
());
if
(
Asserts
.
isNotNull
(
earliestSavepoints
))
{
config
.
setSavePointPath
(
earliestSavepoints
.
getPath
());
config
.
getConfig
().
put
(
SavepointConfigOptions
.
SAVEPOINT_PATH
.
key
(),
earliestSavepoints
.
getPath
());
}
break
;
case
CUSTOM:
config
.
getConfig
().
put
(
SavepointConfigOptions
.
SAVEPOINT_PATH
.
key
(),
config
.
getSavePointPath
());
break
;
default
:
config
.
setSavePointPath
(
null
);
...
...
dlink-executor/src/main/java/com/dlink/executor/AppBatchExecutor.java
View file @
0d80b4ee
package
com
.
dlink
.
executor
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
;
import
com.dlink.assertion.Asserts
;
/**
* AppBatchExecutor
*
...
...
@@ -12,7 +16,12 @@ public class AppBatchExecutor extends Executor {
public
AppBatchExecutor
(
ExecutorSetting
executorSetting
)
{
this
.
executorSetting
=
executorSetting
;
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
();
if
(
Asserts
.
isNotNull
(
executorSetting
.
getConfig
()))
{
Configuration
configuration
=
Configuration
.
fromMap
(
executorSetting
.
getConfig
());
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
(
configuration
);
}
else
{
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
();
}
init
();
}
...
...
dlink-executor/src/main/java/com/dlink/executor/AppStreamExecutor.java
View file @
0d80b4ee
package
com
.
dlink
.
executor
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
;
import
com.dlink.assertion.Asserts
;
/**
* AppStreamExecutor
*
...
...
@@ -12,7 +16,12 @@ public class AppStreamExecutor extends Executor {
public
AppStreamExecutor
(
ExecutorSetting
executorSetting
)
{
this
.
executorSetting
=
executorSetting
;
this
.
environment
=
StreamExecutionEnvironment
.
getExecutionEnvironment
();
if
(
Asserts
.
isNotNull
(
executorSetting
.
getConfig
()))
{
Configuration
configuration
=
Configuration
.
fromMap
(
executorSetting
.
getConfig
());
this
.
environment
=
StreamExecutionEnvironment
.
getExecutionEnvironment
(
configuration
);
}
else
{
this
.
environment
=
StreamExecutionEnvironment
.
getExecutionEnvironment
();
}
init
();
}
...
...
dlink-executor/src/main/java/com/dlink/executor/LocalBatchExecutor.java
View file @
0d80b4ee
package
com
.
dlink
.
executor
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
;
import
com.dlink.assertion.Asserts
;
/**
* LocalBatchExecutor
*
...
...
@@ -12,7 +16,12 @@ public class LocalBatchExecutor extends Executor {
public
LocalBatchExecutor
(
ExecutorSetting
executorSetting
)
{
this
.
executorSetting
=
executorSetting
;
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
();
if
(
Asserts
.
isNotNull
(
executorSetting
.
getConfig
()))
{
Configuration
configuration
=
Configuration
.
fromMap
(
executorSetting
.
getConfig
());
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
(
configuration
);
}
else
{
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
();
}
init
();
}
...
...
dlink-executor/src/main/java/com/dlink/executor/LocalStreamExecutor.java
View file @
0d80b4ee
package
com
.
dlink
.
executor
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
;
import
com.dlink.assertion.Asserts
;
/**
* LocalStreamExecuter
*
...
...
@@ -12,7 +16,12 @@ public class LocalStreamExecutor extends Executor {
public
LocalStreamExecutor
(
ExecutorSetting
executorSetting
)
{
this
.
executorSetting
=
executorSetting
;
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
();
if
(
Asserts
.
isNotNull
(
executorSetting
.
getConfig
()))
{
Configuration
configuration
=
Configuration
.
fromMap
(
executorSetting
.
getConfig
());
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
(
configuration
);
}
else
{
this
.
environment
=
StreamExecutionEnvironment
.
createLocalEnvironment
();
}
init
();
}
...
...
dlink-executor/src/main/java/com/dlink/executor/RemoteBatchExecutor.java
View file @
0d80b4ee
package
com
.
dlink
.
executor
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
;
import
com.dlink.assertion.Asserts
;
/**
* RemoteBatchExecutor
*
...
...
@@ -13,7 +17,12 @@ public class RemoteBatchExecutor extends Executor {
public
RemoteBatchExecutor
(
EnvironmentSetting
environmentSetting
,
ExecutorSetting
executorSetting
)
{
this
.
environmentSetting
=
environmentSetting
;
this
.
executorSetting
=
executorSetting
;
this
.
environment
=
StreamExecutionEnvironment
.
createRemoteEnvironment
(
environmentSetting
.
getHost
(),
environmentSetting
.
getPort
());
if
(
Asserts
.
isNotNull
(
executorSetting
.
getConfig
()))
{
Configuration
configuration
=
Configuration
.
fromMap
(
executorSetting
.
getConfig
());
this
.
environment
=
StreamExecutionEnvironment
.
createRemoteEnvironment
(
environmentSetting
.
getHost
(),
environmentSetting
.
getPort
(),
configuration
);
}
else
{
this
.
environment
=
StreamExecutionEnvironment
.
createRemoteEnvironment
(
environmentSetting
.
getHost
(),
environmentSetting
.
getPort
());
}
init
();
}
...
...
dlink-executor/src/main/java/com/dlink/executor/RemoteStreamExecutor.java
View file @
0d80b4ee
package
com
.
dlink
.
executor
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
;
import
com.dlink.assertion.Asserts
;
/**
* RemoteStreamExecutor
*
...
...
@@ -13,7 +17,12 @@ public class RemoteStreamExecutor extends Executor {
public
RemoteStreamExecutor
(
EnvironmentSetting
environmentSetting
,
ExecutorSetting
executorSetting
)
{
this
.
environmentSetting
=
environmentSetting
;
this
.
executorSetting
=
executorSetting
;
this
.
environment
=
StreamExecutionEnvironment
.
createRemoteEnvironment
(
environmentSetting
.
getHost
(),
environmentSetting
.
getPort
());
if
(
Asserts
.
isNotNull
(
executorSetting
.
getConfig
()))
{
Configuration
configuration
=
Configuration
.
fromMap
(
executorSetting
.
getConfig
());
this
.
environment
=
StreamExecutionEnvironment
.
createRemoteEnvironment
(
environmentSetting
.
getHost
(),
environmentSetting
.
getPort
(),
configuration
);
}
else
{
this
.
environment
=
StreamExecutionEnvironment
.
createRemoteEnvironment
(
environmentSetting
.
getHost
(),
environmentSetting
.
getPort
());
}
init
();
}
...
...
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