Change config parameter name to comply with what was discussed as par…

…t of FLIP-461
XComp · Jun 27, 2024 · 10acb9a · 10acb9a
1 parent e12edd5
commit 10acb9a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/docs/layouts/shortcodes/generated/all_jobmanager_section.html b/docs/layouts/shortcodes/generated/all_jobmanager_section.html
@@ -9,7 +9,7 @@
     </thead>
     <tbody>
         <tr>
-            <td><h5>jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger</h5></td>
+            <td><h5>jobmanager.adaptive-scheduler.max-delay-for-scale-trigger</h5></td>
             <td style="word-wrap: break-word;">(none)</td>
             <td>Duration</td>
             <td>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).</td>

diff --git a/docs/layouts/shortcodes/generated/expert_scheduling_section.html b/docs/layouts/shortcodes/generated/expert_scheduling_section.html
@@ -87,7 +87,7 @@
             <td>The size of the write buffer of JobEventStore. The content will be flushed to external file system once the buffer is full</td>
         </tr>
         <tr>
-            <td><h5>jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger</h5></td>
+            <td><h5>jobmanager.adaptive-scheduler.max-delay-for-scale-trigger</h5></td>
             <td style="word-wrap: break-word;">(none)</td>
             <td>Duration</td>
             <td>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).</td>

diff --git a/docs/layouts/shortcodes/generated/job_manager_configuration.html b/docs/layouts/shortcodes/generated/job_manager_configuration.html
@@ -9,7 +9,7 @@
     </thead>
     <tbody>
         <tr>
-            <td><h5>jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger</h5></td>
+            <td><h5>jobmanager.adaptive-scheduler.max-delay-for-scale-trigger</h5></td>
             <td style="word-wrap: break-word;">(none)</td>
             <td>Duration</td>
             <td>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).</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
@@ -578,8 +578,8 @@ public InlineElement getDescription() {
         Documentation.Sections.EXPERT_SCHEDULING,
         Documentation.Sections.ALL_JOB_MANAGER
     })
-    public static final ConfigOption<Duration> MAXIMUM_DELAY_FOR_RESCALE_TRIGGER =
-            key("jobmanager.adaptive-scheduler.max-delay-for-rescale-trigger")
+    public static final ConfigOption<Duration> MAXIMUM_DELAY_FOR_SCALE_TRIGGER =
+            key("jobmanager.adaptive-scheduler.max-delay-for-scale-trigger")
                     .durationType()
                     .noDefaultValue()
                     .withDescription(

diff --git a/...-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveScheduler.java b/...-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/.../src/test/java/org/apache/flink/runtime/scheduler/adaptive/DefaultRescaleManagerTest.java b/.../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(