diff --git a/docs/layouts/shortcodes/generated/all_jobmanager_section.html b/docs/layouts/shortcodes/generated/all_jobmanager_section.html index 9219592aef05a6..4539ce365d5816 100644 --- a/docs/layouts/shortcodes/generated/all_jobmanager_section.html +++ b/docs/layouts/shortcodes/generated/all_jobmanager_section.html @@ -9,7 +9,7 @@ -
jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger
+
jobmanager.adaptive-scheduler.max-delay-for-scale-trigger
(none) Duration The maximum time the JobManager will wait with evaluating previously observed events for rescaling (default: 0ms if checkpointing is disabled and %dx of the checkpointing interval if checkpointing is enabled). diff --git a/docs/layouts/shortcodes/generated/expert_scheduling_section.html b/docs/layouts/shortcodes/generated/expert_scheduling_section.html index 3d547251af40ee..10e5ad134cecef 100644 --- a/docs/layouts/shortcodes/generated/expert_scheduling_section.html +++ b/docs/layouts/shortcodes/generated/expert_scheduling_section.html @@ -87,7 +87,7 @@ The size of the write buffer of JobEventStore. The content will be flushed to external file system once the buffer is full -
jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger
+
jobmanager.adaptive-scheduler.max-delay-for-scale-trigger
(none) Duration The maximum time the JobManager will wait with evaluating previously observed events for rescaling (default: 0ms if checkpointing is disabled and %dx of the checkpointing interval if checkpointing is enabled). diff --git a/docs/layouts/shortcodes/generated/job_manager_configuration.html b/docs/layouts/shortcodes/generated/job_manager_configuration.html index 36e15791f43dd1..df84946a5b0709 100644 --- a/docs/layouts/shortcodes/generated/job_manager_configuration.html +++ b/docs/layouts/shortcodes/generated/job_manager_configuration.html @@ -9,7 +9,7 @@ -
jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger
+
jobmanager.adaptive-scheduler.max-delay-for-scale-trigger
(none) Duration The maximum time the JobManager will wait with evaluating previously observed events for rescaling (default: 0ms if checkpointing is disabled and %dx of the checkpointing interval if checkpointing is enabled). 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 26aa41830ec2e2..ab95a0e2669422 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 @@ -578,8 +578,8 @@ public InlineElement getDescription() { Documentation.Sections.EXPERT_SCHEDULING, Documentation.Sections.ALL_JOB_MANAGER }) - public static final ConfigOption MAXIMUM_DELAY_FOR_RESCALE_TRIGGER = - key("jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger") + public static final ConfigOption MAXIMUM_DELAY_FOR_SCALE_TRIGGER = + key("jobmanager.adaptive-scheduler.max-delay-for-scale-trigger") .durationType() .noDefaultValue() .withDescription( diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveScheduler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveScheduler.java index e60d57a99b4f37..1a1bcd7c7608f9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveScheduler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveScheduler.java @@ -145,7 +145,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import static org.apache.flink.configuration.JobManagerOptions.MAXIMUM_DELAY_FOR_RESCALE_TRIGGER; +import static org.apache.flink.configuration.JobManagerOptions.MAXIMUM_DELAY_FOR_SCALE_TRIGGER; import static org.apache.flink.configuration.JobManagerOptions.MIN_PARALLELISM_INCREASE; import static org.apache.flink.runtime.executiongraph.ExecutionGraphUtils.isAnyOutputBlocking; @@ -245,8 +245,7 @@ public static Settings of( scalingIntervalMax, configuration.get(MIN_PARALLELISM_INCREASE), configuration.get( - MAXIMUM_DELAY_FOR_RESCALE_TRIGGER, - maximumDelayForRescaleTriggerDefault)); + MAXIMUM_DELAY_FOR_SCALE_TRIGGER, maximumDelayForRescaleTriggerDefault)); } private final SchedulerExecutionMode executionMode; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/DefaultRescaleManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/DefaultRescaleManagerTest.java index 4d630da5bf580a..c24f5ed8c80b67 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/DefaultRescaleManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/DefaultRescaleManagerTest.java @@ -48,7 +48,7 @@ void testProperConfiguration() { configuration.set(JobManagerOptions.SCHEDULER_SCALING_INTERVAL_MIN, scalingIntervalMin); configuration.set(JobManagerOptions.SCHEDULER_SCALING_INTERVAL_MAX, scalingIntervalMax); configuration.set( - JobManagerOptions.MAXIMUM_DELAY_FOR_RESCALE_TRIGGER, maximumDelayForRescaleTrigger); + JobManagerOptions.MAXIMUM_DELAY_FOR_SCALE_TRIGGER, maximumDelayForRescaleTrigger); final DefaultRescaleManager testInstance = DefaultRescaleManager.Factory.fromSettings(