Skip to content
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

[Hotfix][Zeta] Fix job can not restore when last checkpoint failed #6193

Merged
merged 10 commits into from
Jan 17, 2024
Merged

[Hotfix][Zeta] Fix job can not restore when last checkpoint failed #6193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8272803
Fix job can not restore when last checkpoint failed
EricJoy2048 Jan 12, 2024
23468f5
add test case
EricJoy2048 Jan 13, 2024
48641b5
Add test case
EricJoy2048 Jan 13, 2024
0fe913f
Add test case
EricJoy2048 Jan 13, 2024
c1b6ae0
Add test case
EricJoy2048 Jan 13, 2024
2b0a6ae
close the zeta engine client is ci
EricJoy2048 Jan 16, 2024
f28f345
Merge branch '240112_fix_zeta_scheduler' of https://github.com/apache…
EricJoy2048 Jan 16, 2024
da5dfe7
format code
EricJoy2048 Jan 17, 2024
472fab4
remove test case
EricJoy2048 Jan 17, 2024
cc135ab
remove test code
EricJoy2048 Jan 17, 2024
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
14 changes: 14 additions & 0 deletions ...er/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,20 @@ public boolean isCompleted() {
&& !latestCompletedCheckpoint.isRestored();
}

public boolean isNoErrorCompleted() {
if (latestCompletedCheckpoint == null) {
return false;
}
return latestCompletedCheckpoint.getCheckpointType().isFinalCheckpoint()
&& (runningJobStateIMap
.get(checkpointStateImapKey)
.equals(CheckpointCoordinatorStatus.FINISHED)
|| runningJobStateIMap
.get(checkpointStateImapKey)
.equals(CheckpointCoordinatorStatus.SUSPEND))
EricJoy2048 marked this conversation as resolved.
Show resolved Hide resolved
&& !latestCompletedCheckpoint.isRestored();
}

public boolean isEndOfSavePoint() {
if (latestCompletedCheckpoint == null) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion ...server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public CompletableFuture<Void> shutdown(JobStatus jobStatus) {
* the pipeline has been completed;
*/
public boolean isCompletedPipeline(int pipelineId) {
return getCheckpointCoordinator(pipelineId).isCompleted();
return getCheckpointCoordinator(pipelineId).isNoErrorCompleted();
}

/**
Expand Down
Loading