You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/11/29 09:15:08 UTC
flink git commit: [hotfix] Fail unacknowledged checkpoints before
trying to restart the failed tasks
Repository: flink
Updated Branches:
refs/heads/master 450b42414 -> f5ec9c83e
[hotfix] Fail unacknowledged checkpoints before trying to restart the failed tasks
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f5ec9c83
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f5ec9c83
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f5ec9c83
Branch: refs/heads/master
Commit: f5ec9c83e757bcb49e9c3e5d2279d6096ffa5d27
Parents: 450b424
Author: Till Rohrmann <tr...@apache.org>
Authored: Tue Nov 28 10:37:16 2017 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Nov 29 10:12:33 2017 +0100
----------------------------------------------------------------------
.../org/apache/flink/runtime/executiongraph/ExecutionGraph.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f5ec9c83/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
index 8a74001..002f9a0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
@@ -1668,12 +1668,12 @@ public class ExecutionGraph implements AccessExecutionGraph, Archiveable<Archive
// avoiding redundant local failover
if (execution.getGlobalModVersion() == globalModVersion) {
try {
- failoverStrategy.onTaskFailure(execution, ex);
-
// fail all checkpoints which the failed task has not yet acknowledged
if (checkpointCoordinator != null) {
checkpointCoordinator.failUnacknowledgedPendingCheckpointsFor(execution.getAttemptId(), ex);
}
+
+ failoverStrategy.onTaskFailure(execution, ex);
}
catch (Throwable t) {
// bug in the failover strategy - fall back to global failover