Skip to content

[dinky-core]Fix allowNonRestoredState not taking effect when restoring a JAR job from a savepoint #4544

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

Open
zhuxt2015 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[dinky-core]Fix allowNonRestoredState not taking effect when restoring a JAR job from a savepoint #4544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58374b2
[Fix] 修复JAR任务从Savepoint恢复时allowNonRestoredState未生效的问题
zhuxt2015 Mar 20, 2026
e82055d
优化代码
zhuxt2015 Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions dinky-core/src/main/java/org/dinky/job/runner/JobJarRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import org.apache.flink.core.execution.JobClient;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobgraph.SavepointConfigOptions;
import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings;
import org.apache.flink.streaming.api.graph.StreamGraph;

import java.io.File;
Expand All @@ -62,6 +61,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;

import cn.hutool.core.lang.Assert;
Expand Down Expand Up @@ -170,16 +170,25 @@ private GatewayResult submitNormalWithGateway(JobStatement jobStatement) {
private Pipeline getPipeline(JobStatement jobStatement) {
Pipeline pipeline = getJarStreamGraph(jobStatement.getStatement(), jobManager.getDinkyClassLoader());
if (pipeline instanceof StreamGraph) {
if (Asserts.isNotNullString(jobManager.getConfig().getSavePointPath())
|| (Asserts.isNotNull(jobManager.getConfig().getConfigJson())
&& Asserts.isNotNullString(jobManager
.getConfig()
.getConfigJson()
.get(SavepointConfigOptions.SAVEPOINT_PATH)))) {
((StreamGraph) pipeline)
.setSavepointRestoreSettings(SavepointRestoreSettings.forPath(
jobManager.getConfig().getSavePointPath(),
configuration.get(SavepointConfigOptions.SAVEPOINT_IGNORE_UNCLAIMED_STATE)));
String savePointPath = jobManager.getConfig().getSavePointPath();
Map<String, String> configJson = jobManager.getConfig().getConfigJson();
if (Asserts.isNotNullString(savePointPath)
|| (Asserts.isNotNull(configJson)
&& Asserts.isNotNullString(configJson.get(SavepointConfigOptions.SAVEPOINT_PATH.key())))) {
String effectivePath = Asserts.isNotNullString(savePointPath)
? savePointPath
: configJson.get(SavepointConfigOptions.SAVEPOINT_PATH.key());
JarSubmitParam submitParam = JarSubmitParam.getInfo(jobStatement.getStatement());
boolean allowNonRestored = submitParam.getAllowNonRestoredState();
log.info(
"Setting savepoint restore settings, path: {}, allowNonRestoredState: {}",
effectivePath,
allowNonRestored);
// 设置到 getRootConfiguration()，executeAsync 会以它为基础创建拷贝
Configuration rootConfiguration =
executor.getCustomTableEnvironment().getRootConfiguration();
rootConfiguration.set(SavepointConfigOptions.SAVEPOINT_PATH, effectivePath);
rootConfiguration.set(SavepointConfigOptions.SAVEPOINT_IGNORE_UNCLAIMED_STATE, allowNonRestored);
}
}
return pipeline;
Expand Down
Loading