This is an automated email from the ASF dual-hosted git repository. sewen pushed a commit to branch release-1.11 in repository https://gitbox.apache.org/repos/asf/flink.git
commit bb4188adeeb499f97bc4177d3bfb0e37f63d6e46 Author: Stephan Ewen <se...@apache.org> AuthorDate: Fri May 29 21:47:33 2020 +0200 [hotfix][coordination] Remove unused (and unimplemented) method 'failTask(...)' from OperatorCoordinator Context --- .../runtime/operators/coordination/OperatorCoordinator.java | 2 -- .../operators/coordination/OperatorCoordinatorHolder.java | 5 ----- .../coordination/MockOperatorCoordinatorContext.java | 12 ------------ 3 files changed, 19 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinator.java index cac03d7..fff88c7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinator.java @@ -168,8 +168,6 @@ public interface OperatorCoordinator extends AutoCloseable { */ CompletableFuture<Acknowledge> sendEvent(OperatorEvent evt, int targetSubtask) throws TaskNotRunningException; - void failTask(int subtask, Throwable cause); - /** * Fails the job and trigger a global failover operation. * diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinatorHolder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinatorHolder.java index e11bbb5..4e4e8f5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinatorHolder.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/coordination/OperatorCoordinatorHolder.java @@ -425,11 +425,6 @@ public class OperatorCoordinatorHolder implements OperatorCoordinator, OperatorC } @Override - public void failTask(final int subtask, final Throwable cause) { - throw new UnsupportedOperationException(); - } - - @Override public void failJob(final Throwable cause) { checkInitialized(); diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/MockOperatorCoordinatorContext.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/MockOperatorCoordinatorContext.java index 7928535..6b50c2b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/MockOperatorCoordinatorContext.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/MockOperatorCoordinatorContext.java @@ -24,7 +24,6 @@ import org.apache.flink.util.FlinkRuntimeException; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -35,7 +34,6 @@ public class MockOperatorCoordinatorContext implements OperatorCoordinator.Conte private final boolean failEventSending; private final Map<Integer, List<OperatorEvent>> eventsToOperator; - private final LinkedHashMap<Integer, Throwable> failedTasks; private boolean jobFailed; public MockOperatorCoordinatorContext(OperatorID operatorID, int numSubtasks) { @@ -46,7 +44,6 @@ public class MockOperatorCoordinatorContext implements OperatorCoordinator.Conte this.operatorID = operatorID; this.numSubtasks = numSubtasks; this.eventsToOperator = new HashMap<>(); - this.failedTasks = new LinkedHashMap<>(); this.jobFailed = false; this.failEventSending = failEventSending; } @@ -71,11 +68,6 @@ public class MockOperatorCoordinatorContext implements OperatorCoordinator.Conte } @Override - public void failTask(int subtask, Throwable cause) { - failedTasks.put(subtask, cause); - } - - @Override public void failJob(Throwable cause) { jobFailed = true; } @@ -95,10 +87,6 @@ public class MockOperatorCoordinatorContext implements OperatorCoordinator.Conte return eventsToOperator; } - public LinkedHashMap<Integer, Throwable> getFailedTasks() { - return failedTasks; - } - public boolean isJobFailed() { return jobFailed; }