Repository: flink
Updated Branches:
  refs/heads/master 6ffe22db8 -> 77c306be0


[hotfix] Suppress restarts if rescaling operation fails


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/77c306be
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/77c306be
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/77c306be

Branch: refs/heads/master
Commit: 77c306be0f76cf1bc14affd81d7f9a3c25d45593
Parents: 826d51d
Author: Till Rohrmann <trohrm...@apache.org>
Authored: Wed Apr 4 15:47:16 2018 +0200
Committer: Till Rohrmann <trohrm...@apache.org>
Committed: Wed Apr 4 15:49:52 2018 +0200

----------------------------------------------------------------------
 .../java/org/apache/flink/runtime/jobmaster/JobMaster.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/77c306be/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java
----------------------------------------------------------------------
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 934c0b2..f5606fb 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
@@ -41,6 +41,7 @@ import 
org.apache.flink.runtime.clusterframework.types.AllocationID;
 import org.apache.flink.runtime.clusterframework.types.ResourceID;
 import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.execution.ExecutionState;
+import org.apache.flink.runtime.execution.SuppressRestartsException;
 import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph;
 import org.apache.flink.runtime.executiongraph.Execution;
 import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
@@ -508,7 +509,11 @@ public class JobMaster extends 
FencedRpcEndpoint<JobMasterId> implements JobMast
                        (Acknowledge ignored, Throwable throwable) -> {
                                if (throwable != null) {
                                        // fail the newly created execution 
graph
-                                       newExecutionGraph.failGlobal(new 
FlinkException("Failed to rescale the job " + jobGraph.getJobID() + '.', 
throwable));
+                                       newExecutionGraph.failGlobal(
+                                               new SuppressRestartsException(
+                                                       new FlinkException(
+                                                               
String.format("Failed to rescale the job %s.", jobGraph.getJobID()),
+                                                               throwable)));
                                }
                        });
 

Reply via email to