Skip to content

[ISSUE-4339][Bug] Fix latest savepoint lookup #4362

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
hutiefang76 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[ISSUE-4339][Bug] Fix latest savepoint lookup #4362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9cc38
[ISSUE-4339][Bug] Fix latest savepoint lookup
hutiefang Jun 21, 2026
5c8709e
Update FlinkSavepointServiceTest.java
wolfboys Jun 25, 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
3 changes: 3 additions & 0 deletions .../main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ public FlinkSavepoint getLatest(Long id) {
return this.lambdaQuery()
.eq(FlinkSavepoint::getAppId, id)
.eq(FlinkSavepoint::getLatest, true)
.orderByDesc(FlinkSavepoint::getTriggerTime)
.orderByDesc(FlinkSavepoint::getId)
.last("limit 1")
.one();
}

Expand Down
32 changes: 28 additions & 4 deletions ...e/src/test/java/org/apache/streampark/console/core/service/FlinkSavepointServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import org.apache.streampark.console.core.entity.FlinkApplicationConfig;
import org.apache.streampark.console.core.entity.FlinkEffective;
import org.apache.streampark.console.core.entity.FlinkEnv;
import org.apache.streampark.console.core.entity.FlinkSavepoint;
import org.apache.streampark.console.core.enums.ConfigFileTypeEnum;
import org.apache.streampark.console.core.enums.EffectiveTypeEnum;
import org.apache.streampark.console.core.mapper.FlinkSavepointMapper;
import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService;
import org.apache.streampark.console.core.service.application.FlinkApplicationManageService;
import org.apache.streampark.console.core.service.impl.FlinkSavepointServiceImpl;
Expand All @@ -38,6 +40,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;

import java.util.Date;

import static org.apache.flink.configuration.CheckpointingOptions.SAVEPOINT_DIRECTORY;
import static org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions.CHECKPOINTING_INTERVAL;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -66,6 +70,9 @@ class FlinkSavepointServiceTest extends SpringUnitTestBase {
@Autowired
FlinkApplicationManageService applicationManageService;

@Autowired
private FlinkSavepointMapper savepointMapper;

@AfterEach
void cleanTestRecordsInDatabase() {
savepointService.remove(new QueryWrapper<>());
Expand All @@ -92,6 +99,19 @@ void testGetSavepointFromDynamicProps() {
.isEmpty();
}

@Test
void testGetLatestReturnsNewestSavepointWhenDuplicateLatestRecordsExist() {
Long appId = 1L;
FlinkSavepoint older = latestSavepoint(appId, "hdfs:///older", new Date(1000));
FlinkSavepoint newer = latestSavepoint(appId, "hdfs:///newer", new Date(2000));
savepointMapper.insert(older);
savepointMapper.insert(newer);

FlinkSavepoint latest = savepointService.getLatest(appId);

assertThat(latest.getPath()).isEqualTo("hdfs:///newer");
}

@Test
void testGetSavepointFromAppCfgIfStreamParkOrSQLJob() {
FlinkSavepointServiceImpl savepointServiceImpl = (FlinkSavepointServiceImpl) savepointService;
Expand Down Expand Up @@ -184,10 +204,14 @@ void testGetSavepointFromDeployLayer() throws JsonProcessingException {
assertThatThrownBy(() -> savepointServiceImpl.getSavepointFromDeployLayer(application))
.isInstanceOf(NullPointerException.class);

// Ignored.
// Test for it with empty config
// Test for it with the configured empty target value
// Test for it with the configured non-empty target value
}

private FlinkSavepoint latestSavepoint(Long appId, String path, Date triggerTime) {
FlinkSavepoint savepoint = new FlinkSavepoint();
savepoint.setAppId(appId);
savepoint.setLatest(true);
savepoint.setPath(path);
savepoint.setTriggerTime(triggerTime);
return savepoint;
}
}
Loading