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 2019/07/16 09:43:43 UTC

[flink] branch master updated: [FLINK-13223][dist] Enable fine-grained recovery by default in distribution

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 b610ced  [FLINK-13223][dist] Enable fine-grained recovery by default in distribution
b610ced is described below

commit b610cedf18132ad11a44cc90a331349d3617c533
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Jul 16 11:43:29 2019 +0200

    [FLINK-13223][dist] Enable fine-grained recovery by default in distribution
---
 .../main/java/org/apache/flink/configuration/JobManagerOptions.java | 2 +-
 flink-dist/src/main/resources/flink-conf.yaml                       | 6 ++++++
 flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh     | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
index 0f9e18d..75883ba 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
@@ -186,7 +186,7 @@ public class JobManagerOptions {
 	@Documentation.ExcludeFromDocumentation("dev use only; likely temporary")
 	public static final ConfigOption<Boolean> FORCE_PARTITION_RELEASE_ON_CONSUMPTION =
 			key("jobmanager.scheduler.partition.force-release-on-consumption")
-			.defaultValue(true);
+			.defaultValue(false);
 
 	// ---------------------------------------------------------------------------------------------
 
diff --git a/flink-dist/src/main/resources/flink-conf.yaml b/flink-dist/src/main/resources/flink-conf.yaml
index e5da29c..d7c897b 100644
--- a/flink-dist/src/main/resources/flink-conf.yaml
+++ b/flink-dist/src/main/resources/flink-conf.yaml
@@ -120,6 +120,12 @@ parallelism.default: 1
 #
 # state.backend.incremental: false
 
+# The failover strategy, i.e., how the job computation recovers from task failures.
+# Only restart tasks that may have been affected by the task failure, which typically includes
+# downstream tasks and potentially upstream tasks if their produced data is no longer available for consumption.
+
+jobmanager.execution.failover-strategy: region
+
 #==============================================================================
 # Rest & web frontend
 #==============================================================================
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh b/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh
index f6624c0..aa711f9 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh
@@ -29,6 +29,8 @@ echo "Executing test with ${OPENSSL_LINKAGE} openSSL linkage (random selection b
 s3_setup hadoop
 set_conf_ssl "mutual" "OPENSSL" "${OPENSSL_LINKAGE}"
 set_config_key "metrics.fetcher.update-interval" "2000"
+# this test relies on global failovers
+set_config_key "jobmanager.execution.failover-strategy" "full"
 
 OUT=temp/test_streaming_file_sink-$(uuidgen)
 OUTPUT_PATH="$TEST_DATA_DIR/$OUT"