Skip to content

Commit 6c6c44e

Browse files
committed
[hotfix] Refactor autoscaler related setClock to optimize testing
1 parent 66f7b42 commit 6c6c44e

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

flink-autoscaler/src/main/java/org/apache/flink/autoscaler/JobAutoScalerImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,5 +256,7 @@ private AutoscalerFlinkMetrics getOrInitAutoscalerFlinkMetrics(Context ctx) {
256256
@VisibleForTesting
257257
void setClock(Clock clock) {
258258
this.clock = Preconditions.checkNotNull(clock);
259+
this.metricsCollector.setClock(clock);
260+
this.scalingExecutor.setClock(clock);
259261
}
260262
}

flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingExecutor.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import javax.annotation.Nullable;
4343

44+
import java.time.Clock;
4445
import java.time.Duration;
4546
import java.time.Instant;
4647
import java.util.Collections;
@@ -494,4 +495,9 @@ private boolean checkIfBlockedAndTriggerScalingEvent(
494495

495496
return !scaleEnabled || isExcluded;
496497
}
498+
499+
@VisibleForTesting
500+
void setClock(Clock clock) {
501+
jobVertexScaler.setClock(clock);
502+
}
497503
}

flink-autoscaler/src/test/java/org/apache/flink/autoscaler/BacklogBasedScalingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ private void assertCollectedMetricsSize(int expectedSize) throws Exception {
417417

418418
private void setClocksTo(Instant time) {
419419
var clock = Clock.fixed(time, ZoneId.systemDefault());
420-
metricsCollector.setClock(clock);
421420
autoscaler.setClock(clock);
422421
}
423422

flink-autoscaler/src/test/java/org/apache/flink/autoscaler/RecommendedParallelismTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ private void running(Instant now) {
279279

280280
private void setClocksTo(Instant time) {
281281
var clock = Clock.fixed(time, ZoneId.systemDefault());
282-
metricsCollector.setClock(clock);
283282
autoscaler.setClock(clock);
284283
}
285284
}

0 commit comments

Comments
 (0)