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 2018/08/08 12:07:32 UTC
[flink] branch master updated: [FLINK-10102][docs] Fix docs for
EXECUTION_FAILOVER_STRATEGY
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 a9ab420 [FLINK-10102][docs] Fix docs for EXECUTION_FAILOVER_STRATEGY
a9ab420 is described below
commit a9ab4207fc289c8d0610766a28bdfc81b62e99f5
Author: maqingxiang <35...@users.noreply.github.com>
AuthorDate: Wed Aug 8 20:07:28 2018 +0800
[FLINK-10102][docs] Fix docs for EXECUTION_FAILOVER_STRATEGY
---
docs/_includes/generated/job_manager_configuration.html | 2 +-
.../org/apache/flink/configuration/JobManagerOptions.java | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/docs/_includes/generated/job_manager_configuration.html b/docs/_includes/generated/job_manager_configuration.html
index 0353874..edab77e 100644
--- a/docs/_includes/generated/job_manager_configuration.html
+++ b/docs/_includes/generated/job_manager_configuration.html
@@ -20,7 +20,7 @@
<tr>
<td><h5>jobmanager.execution.failover-strategy</h5></td>
<td style="word-wrap: break-word;">"full"</td>
- <td>The maximum number of prior execution attempts kept in history.</td>
+ <td>This option specifies how the job computation recovers from task failures.Accepted values are:<ul><li>'full': Restarts all tasks.</li><li>'individual': Restarts only the failed task. Should only be used if all tasks are independent components.</li><li>'region': Restarts all tasks that could be affected by the task failure.</li></ul></td>
</tr>
<tr>
<td><h5>jobmanager.heap.size</h5></td>
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 2bb5732..c1a23bf 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
@@ -20,8 +20,10 @@ package org.apache.flink.configuration;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.annotation.docs.Documentation;
+import org.apache.flink.configuration.description.Description;
import static org.apache.flink.configuration.ConfigOptions.key;
+import static org.apache.flink.configuration.description.TextElement.text;
/**
* Configuration options for the JobManager.
@@ -102,12 +104,19 @@ public class JobManagerOptions {
.withDescription("The maximum number of prior execution attempts kept in history.");
/**
- * The maximum number of prior execution attempts kept in history.
+ * This option specifies the failover strategy, i.e. how the job computation recovers from task failures.
*/
public static final ConfigOption<String> EXECUTION_FAILOVER_STRATEGY =
key("jobmanager.execution.failover-strategy")
.defaultValue("full")
- .withDescription("The maximum number of prior execution attempts kept in history.");
+ .withDescription(Description.builder()
+ .text("This option specifies how the job computation recovers from task failures." +
+ "Accepted values are:")
+ .list(
+ text("'full': Restarts all tasks."),
+ text("'individual': Restarts only the failed task. Should only be used if all tasks are independent components."),
+ text("'region': Restarts all tasks that could be affected by the task failure.")
+ ).build());
/**
* This option specifies the interval in order to trigger a resource manager reconnection if the connection