You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/05/19 15:02:22 UTC
[2/2] flink git commit: [runtime] Fix for task canceling the order of
(1) resource deregistration (2) completeness notification
[runtime] Fix for task canceling the order of (1) resource deregistration (2) completeness notification
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3cd36a51
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3cd36a51
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3cd36a51
Branch: refs/heads/master
Commit: 3cd36a51d104865540ec23ee326e1c810317c860
Parents: 8e6bb9a
Author: Stephan Ewen <se...@apache.org>
Authored: Tue May 19 12:36:33 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue May 19 12:36:33 2015 +0200
----------------------------------------------------------------------
.../org/apache/flink/runtime/executiongraph/Execution.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3cd36a51/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java
index 742a7c1..a3c82c2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java
@@ -415,14 +415,14 @@ public class Execution implements Serializable {
markTimestamp(CANCELING, getStateTimestamp(CANCELED));
try {
- vertex.executionCanceled();
- }
- finally {
vertex.getExecutionGraph().deregisterExecution(this);
if (assignedResource != null) {
assignedResource.releaseSlot();
}
}
+ finally {
+ vertex.executionCanceled();
+ }
return;
}
// else: fall through the loop