[FLINK-8475][config][docs] Integrate SlotManager options This closes #5390.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a8f64fb4 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a8f64fb4 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a8f64fb4 Branch: refs/heads/master Commit: a8f64fb43ab4d3820b10b546a660d2767577a4f9 Parents: 00cae70 Author: zentol <ches...@apache.org> Authored: Mon Jan 22 16:40:20 2018 +0100 Committer: zentol <ches...@apache.org> Committed: Mon Feb 12 18:48:55 2018 +0100 ---------------------------------------------------------------------- .../generated/slot_manager_configuration.html | 21 ++++++++++++++++++++ docs/ops/config.md | 4 +--- .../configuration/ResourceManagerOptions.java | 3 +++ 3 files changed, 25 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a8f64fb4/docs/_includes/generated/slot_manager_configuration.html ---------------------------------------------------------------------- diff --git a/docs/_includes/generated/slot_manager_configuration.html b/docs/_includes/generated/slot_manager_configuration.html new file mode 100644 index 0000000..97f4b4c --- /dev/null +++ b/docs/_includes/generated/slot_manager_configuration.html @@ -0,0 +1,21 @@ +<table class="table table-bordered"> + <thead> + <tr> + <th class="text-left" style="width: 20%">Key</th> + <th class="text-left" style="width: 15%">Default</th> + <th class="text-left" style="width: 65%">Description</th> + </tr> + </thead> + <tbody> + <tr> + <td><h5>slotmanager.request-timeout</h5></td> + <td>600000</td> + <td>The timeout for a slot request to be discarded.</td> + </tr> + <tr> + <td><h5>slotmanager.taskmanager-timeout</h5></td> + <td>30000</td> + <td>The timeout for an idle task manager to be released.</td> + </tr> + </tbody> +</table> http://git-wip-us.apache.org/repos/asf/flink/blob/a8f64fb4/docs/ops/config.md ---------------------------------------------------------------------- diff --git a/docs/ops/config.md b/docs/ops/config.md index dc24955..2290c75 100644 --- a/docs/ops/config.md +++ b/docs/ops/config.md @@ -507,9 +507,7 @@ You have to configure `jobmanager.archive.fs.dir` in order to archive terminated The configuration keys in this section are relevant for the SlotManager running in the Flip-6 ResourceManager -- `slotmanager.request-timeout`: Timeout after which a slot request will be discarded by the SlotManager. The value is specified in milli seconds (DEFAULT: `300000`). - -- `slotmanager.taskmanager-timeout`: Timeout after which an idling task manager's container is released (DEFAULT: `30000`). +{% include generated/slot_manager_configuration.html %} ## Background http://git-wip-us.apache.org/repos/asf/flink/blob/a8f64fb4/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java index 1c943b6..7d0f405 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java @@ -24,6 +24,9 @@ import org.apache.flink.annotation.PublicEvolving; * The set of configuration options relating to the ResourceManager. */ @PublicEvolving +@ConfigGroups(groups = { + @ConfigGroup(name = "SlotManager", keyPrefix = "slotmanager") +}) public class ResourceManagerOptions { /**
