Skip to content

[FLINK-36473] Wait for metrics before asserting on them #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 11, 2024
Merged

[FLINK-36473] Wait for metrics before asserting on them #896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f01fbc3
[FLINK-36473] Make `testJmMetricCollection` more robust in the face o…
SamBarker Oct 10, 2024
76e3b26
[FLINK-36473] Wait for metrics to appear before asserting on them.
SamBarker Oct 11, 2024
f95263c
[FLINK-36473] Depend on awaitility in flink-autoscaler.
SamBarker Oct 11, 2024
c00d71f
[FLINK-36473] bump to the latest version of awaitility
SamBarker Oct 11, 2024
19f25e5
[FLINK-36473] drop duplicated property.
SamBarker Oct 11, 2024
5256ad3
[FLINK-36473] use appropriate scope
SamBarker Oct 11, 2024
c8d9b62
[FLINK-36473] better comparison for doubles
SamBarker Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 38 additions & 29 deletions flink-autoscaler/src/test/java/org/apache/flink/autoscaler/RestApiMetricsCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,21 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;

import java.time.Duration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;

/** Tests for {@link RestApiMetricsCollector}. */
public class RestApiMetricsCollectorTest {
class RestApiMetricsCollectorTest {

private static final String GC_METRIC_NAME = "Status.JVM.GarbageCollector.All.TimeMsPerSecond";
private static final String HEAP_MAX_NAME = "Status.JVM.Memory.Heap.Max";
Expand All @@ -64,7 +67,7 @@ public class RestApiMetricsCollectorTest {
private static final String METASPACE_MEMORY_NAME = "Status.JVM.Memory.Metaspace.Used";

@Test
public void testAggregateMultiplePendingRecordsMetricsPerSource() throws Exception {
void testAggregateMultiplePendingRecordsMetricsPerSource() throws Exception {
var collector = new RestApiMetricsCollector<JobID, JobAutoScalerContext<JobID>>();

JobVertexID jobVertexID = new JobVertexID();
Expand Down Expand Up @@ -145,7 +148,7 @@ CompletableFuture<P> sendRequest(

@Test
@Timeout(60)
public void testJmMetricCollection() throws Exception {
void testJmMetricCollection() throws Exception {
try (MiniCluster miniCluster =
new MiniCluster(
new MiniClusterConfiguration.Builder()
Expand All @@ -160,36 +163,38 @@ public void testJmMetricCollection() throws Exception {
(c, e) ->
new StandaloneClientHAServices(
miniCluster.getRestAddress().get().toString()));
do {
var collector = new RestApiMetricsCollector<>();
Map<FlinkMetric, Metric> flinkMetricMetricMap =
collector.queryJmMetrics(
client,
Map.of(
"taskSlotsTotal", FlinkMetric.NUM_TASK_SLOTS_TOTAL,
"taskSlotsAvailable",
FlinkMetric.NUM_TASK_SLOTS_AVAILABLE));
try {
assertEquals(
"3",
flinkMetricMetricMap.get(FlinkMetric.NUM_TASK_SLOTS_TOTAL).getValue());
assertEquals(
"3",
flinkMetricMetricMap
.get(FlinkMetric.NUM_TASK_SLOTS_AVAILABLE)
.getValue());
break;
} catch (NullPointerException e) {
// Metrics might not be available yet (timeout above will eventually kill this
// test)
Thread.sleep(100);
}
} while (true);
var collector = new RestApiMetricsCollector<>();
Map<FlinkMetric, Metric> flinkMetricMetricMap = new HashMap<>();
// Metrics might not be available yet so retry the query until it returns results or the
// timeout reached.
await().atMost(Duration.ofSeconds(60))
.until(
() -> {
final Map<FlinkMetric, Metric> results =
collector.queryJmMetrics(
client,
Map.of(
"taskSlotsTotal",
FlinkMetric.NUM_TASK_SLOTS_TOTAL,
"taskSlotsAvailable",
FlinkMetric.NUM_TASK_SLOTS_AVAILABLE));
flinkMetricMetricMap.putAll(results);
return !results.isEmpty();
});

assertThat(flinkMetricMetricMap)
.hasSize(2)
.hasEntrySatisfying(
FlinkMetric.NUM_TASK_SLOTS_TOTAL,
metricValue -> assertMetricValueIs(metricValue, 3))
.hasEntrySatisfying(
FlinkMetric.NUM_TASK_SLOTS_AVAILABLE,
metricValue -> assertMetricValueIs(metricValue, 3));
}
}

@Test
public void testTmMetricCollection() throws Exception {
void testTmMetricCollection() throws Exception {

var metricValues = new HashMap<String, AggregatedMetric>();

Expand Down Expand Up @@ -309,4 +314,8 @@ private static void assertMetricsEquals(
assertEquals(v.getSum(), a.getSum(), k.name());
});
}

private static void assertMetricValueIs(Metric metricValue, int expected) {
assertThat(metricValue.getValue()).asInt().isEqualTo(expected);
}
}
Loading