flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [1/4] flink git commit: [FLINK-2958] Remove hard coded number of execution retries
Date Tue, 03 Nov 2015 15:27:16 GMT
Repository: flink
Updated Branches:
  refs/heads/master ede80e227 -> 8f74718b1


[FLINK-2958] Remove hard coded number of execution retries


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

Branch: refs/heads/master
Commit: 8f74718b1e0a7309e2c29aad1f99891b56fb845e
Parents: aa1c145
Author: Ufuk Celebi <uce@apache.org>
Authored: Tue Nov 3 12:06:46 2015 +0100
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue Nov 3 16:25:49 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/flink/api/common/ExecutionConfig.java     | 6 +++---
 .../flink/streaming/api/graph/StreamingJobGraphGenerator.java | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/8f74718b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
index b620796..b031441 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
@@ -246,7 +246,7 @@ public class ExecutionConfig implements Serializable {
 	public int getNumberOfExecutionRetries() {
 		return numberOfExecutionRetries;
 	}
-	
+
 	/**
 	 * Returns the delay between execution retries.
 	 */
@@ -269,9 +269,9 @@ public class ExecutionConfig implements Serializable {
 		this.numberOfExecutionRetries = numberOfExecutionRetries;
 		return this;
 	}
-	
+
 	/**
-	 * Sets the delay between executions. A value of {@code -1} indicates that the default value

+	 * Sets the delay between executions. A value of {@code -1} indicates that the default value
 	 * should be used.
 	 * @param executionRetryDelay The number of milliseconds the system will wait to retry.
 	 */

http://git-wip-us.apache.org/repos/asf/flink/blob/8f74718b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
index d7d20af..a829a8d 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
@@ -421,12 +421,7 @@ public class StreamingJobGraphGenerator {
 
 	private void configureExecutionRetries() {
 		int executionRetries = streamGraph.getExecutionConfig().getNumberOfExecutionRetries();
-		if (executionRetries != -1) {
-			jobGraph.setNumberOfExecutionRetries(executionRetries);
-		} else {
-			// if the user didn't configure anything, the number of retries is 0.
-			jobGraph.setNumberOfExecutionRetries(0);
-		}
+		jobGraph.setNumberOfExecutionRetries(executionRetries);
 	}
 
 	private void configureExecutionRetryDelay() {


Mime
View raw message