You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/07/09 14:20:34 UTC

[flink] branch master updated: [FLINK-18533][coordination] Disable cancellation of unknown deployments

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

chesnay 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 6e811e6  [FLINK-18533][coordination] Disable cancellation of unknown deployments
6e811e6 is described below

commit 6e811e6f21e5baa6bfb1862a51815e1d151c7097
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Jul 9 14:33:19 2020 +0200

    [FLINK-18533][coordination] Disable cancellation of unknown deployments
    
    Temporarily disabled due to stability issues.
---
 .../src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java     | 2 +-
 .../jobmaster/JobMasterExecutionDeploymentReconciliationTest.java       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
index 74b6e1a..7e54f3a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
@@ -254,7 +254,7 @@ public class JobMaster extends FencedRpcEndpoint<JobMasterId> implements JobMast
 				for (ExecutionAttemptID executionAttemptId : executionAttemptIds) {
 					Tuple2<TaskManagerLocation, TaskExecutorGateway> taskManagerInfo = registeredTaskManagers.get(host);
 					if (taskManagerInfo != null) {
-						taskManagerInfo.f1.cancelTask(executionAttemptId, rpcTimeout);
+						//taskManagerInfo.f1.cancelTask(executionAttemptId, rpcTimeout);
 					}
 				}
 			}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterExecutionDeploymentReconciliationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterExecutionDeploymentReconciliationTest.java
index 36f07d9..b9fddac 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterExecutionDeploymentReconciliationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterExecutionDeploymentReconciliationTest.java
@@ -48,6 +48,7 @@ import org.apache.flink.util.TestLogger;
 
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -88,6 +89,7 @@ public class JobMasterExecutionDeploymentReconciliationTest extends TestLogger {
 	}
 
 	@Test
+	@Ignore
 	public void testExecutionDeploymentReconciliation() throws Exception {
 		JobMasterBuilder.TestingOnCompletionActions onCompletionActions = new JobMasterBuilder.TestingOnCompletionActions();