You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2016/12/07 16:05:38 UTC
flink git commit: [FLINK-5276] [eg] Check for null when archiving
prior execution attempts
Repository: flink
Updated Branches:
refs/heads/release-1.1 f46b7a00a -> 75b48edd1
[FLINK-5276] [eg] Check for null when archiving prior execution attempts
This closes #2957.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/75b48edd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/75b48edd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/75b48edd
Branch: refs/heads/release-1.1
Commit: 75b48edd1b854858ecd32db8bfbd3ef95b96f8e8
Parents: f46b7a0
Author: Ufuk Celebi <uc...@apache.org>
Authored: Wed Dec 7 14:26:35 2016 +0100
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Wed Dec 7 17:03:19 2016 +0100
----------------------------------------------------------------------
.../apache/flink/runtime/executiongraph/ExecutionVertex.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/75b48edd/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
index b1e8475..e74b4c8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
@@ -132,7 +132,7 @@ public class ExecutionVertex implements Serializable {
this.jobVertex = jobVertex;
this.subTaskIndex = subTaskIndex;
- this.resultPartitions = new LinkedHashMap<IntermediateResultPartitionID, IntermediateResultPartition>(producedDataSets.length, 1);
+ this.resultPartitions = new LinkedHashMap<>(producedDataSets.length, 1);
for (IntermediateResult result : producedDataSets) {
IntermediateResultPartition irp = new IntermediateResultPartition(result, this, subTaskIndex);
@@ -580,7 +580,10 @@ public class ExecutionVertex implements Serializable {
// prepare previous executions for archiving
for (Execution exec : priorExecutions) {
- exec.prepareForArchiving();
+ // The bounded list returns null for evicted executions
+ if (exec != null) {
+ exec.prepareForArchiving();
+ }
}
// clear the unnecessary fields in this class