[flink] branch master updated: [hotfix][runtime] Remove executionCanceled() and executionFailed() from ExecutionVertex

[gary]

This is an automated email from the ASF dual-hosted git repository.

gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b38256  [hotfix][runtime] Remove executionCanceled() and 
executionFailed() from ExecutionVertex
4b38256 is described below

commit 4b38256418a96058457a356dabfdfdcee1ca633b
Author: Gary Yao <g...@apache.org>
AuthorDate: Wed May 8 09:57:51 2019 +0200

    [hotfix][runtime] Remove executionCanceled() and executionFailed() from 
ExecutionVertex
    
    This closes #8369.
---
 .../apache/flink/runtime/executiongraph/Execution.java  | 17 ++++-------------
 .../flink/runtime/executiongraph/ExecutionVertex.java   |  8 --------
 2 files changed, 4 insertions(+), 21 deletions(-)

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 e413619..d744f60 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
@@ -1039,12 +1039,8 @@ public class Execution implements AccessExecution, 
Archiveable<ArchivedExecution
        }
 
        private void finishCancellation() {
-               try {
-                       releaseAssignedResource(new FlinkException("Execution " 
+ this + " was cancelled."));
-                       vertex.getExecutionGraph().deregisterExecution(this);
-               } finally {
-                       vertex.executionCanceled(this);
-               }
+               releaseAssignedResource(new FlinkException("Execution " + this 
+ " was cancelled."));
+               vertex.getExecutionGraph().deregisterExecution(this);
        }
 
        void cachePartitionInfo(PartitionInfo partitionInfo) {
@@ -1101,13 +1097,8 @@ public class Execution implements AccessExecution, 
Archiveable<ArchivedExecution
 
                                updateAccumulatorsAndMetrics(userAccumulators, 
metrics);
 
-                               try {
-                                       releaseAssignedResource(t);
-                                       
vertex.getExecutionGraph().deregisterExecution(this);
-                               }
-                               finally {
-                                       vertex.executionFailed(this, t);
-                               }
+                               releaseAssignedResource(t);
+                               
vertex.getExecutionGraph().deregisterExecution(this);
 
                                if (!isCallback && (current == RUNNING || 
current == DEPLOYING)) {
                                        if (LOG.isDebugEnabled()) {
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 86fb0ae..757e2f4 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
@@ -795,14 +795,6 @@ public class ExecutionVertex implements 
AccessExecutionVertex, Archiveable<Archi
                getExecutionGraph().vertexFinished();
        }
 
-       void executionCanceled(Execution execution) {
-               // nothing to do
-       }
-
-       void executionFailed(Execution execution, Throwable cause) {
-               // nothing to do
-       }
-
        // 
--------------------------------------------------------------------------------------------
        //   Miscellaneous
        // 
--------------------------------------------------------------------------------------------