You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ga...@apache.org on 2024/01/12 06:49:56 UTC
(seatunnel) 01/01: Fix job can not restore when last checkpoint failed
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch 240112_fix_zeta_scheduler
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
commit 8272803ca23decb2485d7fdd67c1b2d679da3ec8
Author: Eric <ga...@gmail.com>
AuthorDate: Fri Jan 12 14:03:25 2024 +0800
Fix job can not restore when last checkpoint failed
---
.../engine/server/checkpoint/CheckpointCoordinator.java | 14 ++++++++++++++
.../engine/server/checkpoint/CheckpointManager.java | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointCoordinator.java b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointCoordinator.java
index 6a88f169fc..aa8fd623fc 100644
--- a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointCoordinator.java
+++ b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointCoordinator.java
@@ -827,6 +827,20 @@ public class CheckpointCoordinator {
&& !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))
+ && !latestCompletedCheckpoint.isRestored();
+ }
+
public boolean isEndOfSavePoint() {
if (latestCompletedCheckpoint == null) {
return false;
diff --git a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointManager.java b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointManager.java
index d915cb5a79..e2522ad5ae 100644
--- a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointManager.java
+++ b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointManager.java
@@ -251,7 +251,7 @@ public class CheckpointManager {
* the pipeline has been completed;
*/
public boolean isCompletedPipeline(int pipelineId) {
- return getCheckpointCoordinator(pipelineId).isCompleted();
+ return getCheckpointCoordinator(pipelineId).isNoErrorCompleted();
}
/**