This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.13 by this push:
new 16ec833 [hotfix] Set default value of resource-stabilization-timeout
to 10s
16ec833 is described below
commit 16ec8337f866b9118488d9cfafd1bb025f7aaedc
Author: Till Rohrmann <trohrm...@apache.org>
AuthorDate: Wed Apr 21 21:15:32 2021 +0200
[hotfix] Set default value of resource-stabilization-timeout to 10s
Additionally, set speed up the AdaptiveScheduler ITCases by configuring a
very low
jobmanager.adaptive-scheduler.resource-stabilization-timeout.
---
docs/layouts/shortcodes/generated/all_jobmanager_section.html | 2 +-
docs/layouts/shortcodes/generated/expert_scheduling_section.html | 2 +-
docs/layouts/shortcodes/generated/job_manager_configuration.html | 2 +-
docs/layouts/shortcodes/generated/table_config_configuration.html | 2 +-
.../main/java/org/apache/flink/configuration/JobManagerOptions.java | 2 +-
.../runtime/scheduler/adaptive/AdaptiveSchedulerClusterITCase.java | 3 +++
.../runtime/scheduler/adaptive/AdaptiveSchedulerSimpleITCase.java | 3 +++
7 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/docs/layouts/shortcodes/generated/all_jobmanager_section.html
b/docs/layouts/shortcodes/generated/all_jobmanager_section.html
index d542cab..0069c94 100644
--- a/docs/layouts/shortcodes/generated/all_jobmanager_section.html
+++ b/docs/layouts/shortcodes/generated/all_jobmanager_section.html
@@ -16,7 +16,7 @@
</tr>
<tr>
<td><h5>jobmanager.adaptive-scheduler.resource-stabilization-timeout</h5></td>
- <td style="word-wrap: break-word;">5 min</td>
+ <td style="word-wrap: break-word;">10 s</td>
<td>Duration</td>
<td>The resource stabilization timeout defines the time the
JobManager will wait if fewer than the desired but sufficient resources are
available. The timeout starts once sufficient resources for running the job are
available. Once this timeout has passed, the job will start executing with the
available resources.<br />If <code
class="highlighter-rouge">scheduler-mode</code> is configured to <code
class="highlighter-rouge">REACTIVE</code>, this configuration value will defaul
[...]
</tr>
diff --git a/docs/layouts/shortcodes/generated/expert_scheduling_section.html
b/docs/layouts/shortcodes/generated/expert_scheduling_section.html
index 3e7807b..102575f 100644
--- a/docs/layouts/shortcodes/generated/expert_scheduling_section.html
+++ b/docs/layouts/shortcodes/generated/expert_scheduling_section.html
@@ -22,7 +22,7 @@
</tr>
<tr>
<td><h5>jobmanager.adaptive-scheduler.resource-stabilization-timeout</h5></td>
- <td style="word-wrap: break-word;">5 min</td>
+ <td style="word-wrap: break-word;">10 s</td>
<td>Duration</td>
<td>The resource stabilization timeout defines the time the
JobManager will wait if fewer than the desired but sufficient resources are
available. The timeout starts once sufficient resources for running the job are
available. Once this timeout has passed, the job will start executing with the
available resources.<br />If <code
class="highlighter-rouge">scheduler-mode</code> is configured to <code
class="highlighter-rouge">REACTIVE</code>, this configuration value will defaul
[...]
</tr>
diff --git a/docs/layouts/shortcodes/generated/job_manager_configuration.html
b/docs/layouts/shortcodes/generated/job_manager_configuration.html
index 619e86e..f7882b9 100644
--- a/docs/layouts/shortcodes/generated/job_manager_configuration.html
+++ b/docs/layouts/shortcodes/generated/job_manager_configuration.html
@@ -16,7 +16,7 @@
</tr>
<tr>
<td><h5>jobmanager.adaptive-scheduler.resource-stabilization-timeout</h5></td>
- <td style="word-wrap: break-word;">5 min</td>
+ <td style="word-wrap: break-word;">10 s</td>
<td>Duration</td>
<td>The resource stabilization timeout defines the time the
JobManager will wait if fewer than the desired but sufficient resources are
available. The timeout starts once sufficient resources for running the job are
available. Once this timeout has passed, the job will start executing with the
available resources.<br />If <code
class="highlighter-rouge">scheduler-mode</code> is configured to <code
class="highlighter-rouge">REACTIVE</code>, this configuration value will defaul
[...]
</tr>
diff --git a/docs/layouts/shortcodes/generated/table_config_configuration.html
b/docs/layouts/shortcodes/generated/table_config_configuration.html
index ff14b8b..7d9b938 100644
--- a/docs/layouts/shortcodes/generated/table_config_configuration.html
+++ b/docs/layouts/shortcodes/generated/table_config_configuration.html
@@ -30,7 +30,7 @@
<td><h5>table.local-time-zone</h5><br> <span class="label
label-primary">Batch</span> <span class="label
label-primary">Streaming</span></td>
<td style="word-wrap: break-word;">"default"</td>
<td>String</td>
- <td>The local time zone defines current session time zone id. It
is used when converting to/from <code>TIMESTAMP WITH LOCAL TIME
ZONE</code>. Internally, timestamps with local time zone are always
represented in the UTC time zone. However, when converting to data types that
don't include a time zone (e.g. TIMESTAMP, TIME, or simply STRING), the session
time zone is used during conversion. The input of option is either a full name
such as "America/Los_Angeles", or [...]
+ <td>The local time zone defines current session time zone id. It
is used when converting to/from <code>TIMESTAMP WITH LOCAL TIME
ZONE</code>. Internally, timestamps with local time zone are always
represented in the UTC time zone. However, when converting to data types that
don't include a time zone (e.g. TIMESTAMP, TIME, or simply STRING), the session
time zone is used during conversion. The input of option is either an
abbreviation such as "PST", a full name suc [...]
</tr>
<tr>
<td><h5>table.planner</h5><br> <span class="label
label-primary">Batch</span> <span class="label
label-primary">Streaming</span></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 4cb52e5..8f82e64 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
@@ -427,7 +427,7 @@ public class JobManagerOptions {
public static final ConfigOption<Duration> RESOURCE_STABILIZATION_TIMEOUT =
key("jobmanager.adaptive-scheduler.resource-stabilization-timeout")
.durationType()
- .defaultValue(RESOURCE_WAIT_TIMEOUT.defaultValue())
+ .defaultValue(Duration.ofSeconds(10L))
.withDescription(
Description.builder()
.text(
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerClusterITCase.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerClusterITCase.java
index 38a5c6a..0bae111 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerClusterITCase.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerClusterITCase.java
@@ -37,6 +37,7 @@ import org.junit.Rule;
import org.junit.Test;
import java.io.IOException;
+import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import static org.junit.Assert.assertEquals;
@@ -69,6 +70,8 @@ public class AdaptiveSchedulerClusterITCase extends
TestLogger {
configuration.set(JobManagerOptions.SCHEDULER,
JobManagerOptions.SchedulerType.Adaptive);
configuration.set(ClusterOptions.ENABLE_DECLARATIVE_RESOURCE_MANAGEMENT, true);
+ configuration.set(
+ JobManagerOptions.RESOURCE_STABILIZATION_TIMEOUT,
Duration.ofMillis(100L));
return configuration;
}
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerSimpleITCase.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerSimpleITCase.java
index 70f11fd..5c14764 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerSimpleITCase.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerSimpleITCase.java
@@ -43,6 +43,7 @@ import org.junit.ClassRule;
import org.junit.Test;
import java.io.IOException;
+import java.time.Duration;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
@@ -61,6 +62,8 @@ public class AdaptiveSchedulerSimpleITCase extends TestLogger
{
configuration.set(JobManagerOptions.SCHEDULER,
JobManagerOptions.SchedulerType.Adaptive);
configuration.set(ClusterOptions.ENABLE_DECLARATIVE_RESOURCE_MANAGEMENT, true);
+ configuration.set(
+ JobManagerOptions.RESOURCE_STABILIZATION_TIMEOUT,
Duration.ofMillis(100L));
return configuration;
}
