Skip to content

Commit c515429

Browse files
committed
[hotfix] Refactor autoscaler related setClock to optimize testing
1 parent 5d301d1 commit c515429

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
@@ -251,5 +251,7 @@ private AutoscalerFlinkMetrics getOrInitAutoscalerFlinkMetrics(Context ctx) {
251251
@VisibleForTesting
252252
void setClock(Clock clock) {
253253
this.clock = Preconditions.checkNotNull(clock);
254+
this.metricsCollector.setClock(clock);
255+
this.scalingExecutor.setClock(clock);
254256
}
255257
}

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
@@ -416,7 +416,6 @@ private void assertCollectedMetricsSize(int expectedSize) throws Exception {
416416

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

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
@@ -278,7 +278,6 @@ private void running(Instant now) {
278278

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

0 commit comments

Comments
 (0)