[hotfix] Change default for SLOT_IDLE_TIMEOUT to match HEARTBEAT_TIMEOUT That preserves sticky slot allocation for local recovery for lost JVMs that can take as long as the heartbeat timeout to be detected.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b17be267 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b17be267 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b17be267 Branch: refs/heads/master Commit: b17be267118dd2fe22172c204597aa90db72f909 Parents: a7b54f1 Author: Stefan Richter <s.rich...@data-artisans.com> Authored: Tue Mar 13 13:30:48 2018 +0100 Committer: Stefan Richter <s.rich...@data-artisans.com> Committed: Thu May 17 10:03:03 2018 +0200 ---------------------------------------------------------------------- docs/_includes/generated/job_manager_configuration.html | 2 +- .../java/org/apache/flink/configuration/JobManagerOptions.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/b17be267/docs/_includes/generated/job_manager_configuration.html ---------------------------------------------------------------------- diff --git a/docs/_includes/generated/job_manager_configuration.html b/docs/_includes/generated/job_manager_configuration.html index 251731a..db0ca53 100644 --- a/docs/_includes/generated/job_manager_configuration.html +++ b/docs/_includes/generated/job_manager_configuration.html @@ -54,7 +54,7 @@ </tr> <tr> <td><h5>slot.idle.timeout</h5></td> - <td style="word-wrap: break-word;">10000</td> + <td style="word-wrap: break-word;">50000</td> <td>The timeout in milliseconds for a idle slot in Slot Pool.</td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/flink/blob/b17be267/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java ---------------------------------------------------------------------- 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 ade3958..add8e68 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 @@ -140,7 +140,8 @@ public class JobManagerOptions { public static final ConfigOption<Long> SLOT_IDLE_TIMEOUT = key("slot.idle.timeout") - .defaultValue(10L * 1000L) + // default matches heartbeat.timeout so that sticky allocation is not lost on timeouts for local recovery + .defaultValue(HeartbeatManagerOptions.HEARTBEAT_TIMEOUT.defaultValue()) .withDescription("The timeout in milliseconds for a idle slot in Slot Pool."); // ---------------------------------------------------------------------------------------------
