Skip to content

[Fix] Fix savepoint state stuck in SAVEPOINTING after savepoint completion (#4338) #4504

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
zhang-arvin wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[Fix] Fix savepoint state stuck in SAVEPOINTING after savepoint completion (#4338) #4504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion streampark-common/src/main/java/org/apache/streampark/common/util/DeflaterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ public static String zipString(String text) {
}

public static String unzipString(String zipString) {
byte[] decode = Base64.getDecoder().decode(zipString);
byte[] decode;
try {
decode = Base64.getDecoder().decode(zipString);
} catch (IllegalArgumentException e) {
LOG.warn("Failed to decode base64 string: {}", e.getMessage());
return null;
}
Inflater inflater = new Inflater();
inflater.setInput(decode);
byte[] bytes = new byte[256];
Expand Down
7 changes: 5 additions & 2 deletions .../src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,11 @@ private void process(FlinkApplication application, @Nonnull CheckPoints.CheckPoi
if (CheckPointStatusEnum.COMPLETED == status) {
if (shouldStoreAsSavepoint(checkPointKey, checkPoint)) {
savepointedCache.put(checkPointKey.getSavePointId(), DEFAULT_FLAG_BYTE);
saveSavepoint(checkPoint, application.getId());
flinkAppHttpWatcher.cleanSavepoint(application);
try {
saveSavepoint(checkPoint, application.getId());
} finally {
flinkAppHttpWatcher.cleanSavepoint(application);
}
return;
}

Expand Down
6 changes: 6 additions & 0 deletions ...ark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ public void doSetVersion() {

public Map<String, String> convertFlinkYamlAsMap() {
String flinkYamlString = DeflaterUtils.unzipString(flinkConf);
if (flinkYamlString == null) {
return new java.util.HashMap<>();
}
if (isLegacyFlinkConf()) {
return FlinkConfigurationUtils.loadLegacyFlinkConf(flinkYamlString);
}
Expand Down Expand Up @@ -168,6 +171,9 @@ public String getVersionOfLast() {
public Properties getFlinkConfig() {
String flinkYamlString = DeflaterUtils.unzipString(flinkConf);
Properties flinkConfig = new Properties();
if (flinkYamlString == null) {
return flinkConfig;
}
Map<String, String> config = FlinkConfigurationUtils.loadLegacyFlinkConf(flinkYamlString);
flinkConfig.putAll(config);
return flinkConfig;
Expand Down
Loading