Skip to content

Commit 8698ab4

Browse files
committed
[hotfix] Fix testfail due to data race with after migration to Fabric8 interceptor
1 parent 4f87bc2 commit 8698ab4

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public void testJmMetricCollection() throws Exception {
160160
(c, e) ->
161161
new StandaloneClientHAServices(
162162
miniCluster.getRestAddress().get().toString()));
163+
Thread.sleep(500);
163164
do {
164165
var collector = new RestApiMetricsCollector<>();
165166
Map<FlinkMetric, Metric> flinkMetricMetricMap =

flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesClientMetricsTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class KubernetesClientMetricsTest {
9999

100100
@Test
101101
@Order(1)
102-
public void testMetricsDisabled() {
102+
public void testMetricsDisabled() throws Exception {
103103
var configuration = new Configuration();
104104
configuration.set(
105105
KubernetesOperatorMetricOptions.OPERATOR_KUBERNETES_CLIENT_METRICS_ENABLED, false);
@@ -112,6 +112,7 @@ public void testMetricsDisabled() {
112112

113113
var deployment = TestUtils.buildApplicationCluster();
114114
kubernetesClient.resource(deployment).get();
115+
Thread.sleep(500);
115116
assertFalse(listener.getCounter(listener.getMetricId(REQUEST_COUNTER_ID)).isPresent());
116117
assertFalse(listener.getMeter(listener.getMetricId(REQUEST_METER_ID)).isPresent());
117118
assertFalse(
@@ -125,7 +126,7 @@ public void testMetricsDisabled() {
125126

126127
@Test
127128
@Order(2)
128-
public void testMetricsEnabled() {
129+
public void testMetricsEnabled() throws Exception {
129130
var configuration = new Configuration();
130131
var listener = new TestingMetricListener(configuration);
131132
var kubernetesClient =
@@ -165,6 +166,7 @@ public void testMetricsEnabled() {
165166
.getMax());
166167

167168
kubernetesClient.resource(deployment).createOrReplace();
169+
Thread.sleep(500);
168170
assertEquals(
169171
1, listener.getCounter(listener.getMetricId(REQUEST_COUNTER_ID)).get().getCount());
170172
assertEquals(
@@ -193,13 +195,15 @@ public void testMetricsEnabled() {
193195
> 0);
194196

195197
kubernetesClient.resource(deployment).delete();
198+
Thread.sleep(500);
196199
assertEquals(
197200
1,
198201
listener.getCounter(listener.getMetricId(REQUEST_DELETE_COUNTER_ID))
199202
.get()
200203
.getCount());
201204

202205
kubernetesClient.resource(deployment).delete();
206+
Thread.sleep(500);
203207
assertEquals(
204208
2,
205209
listener.getCounter(listener.getMetricId(REQUEST_DELETE_COUNTER_ID))
@@ -304,7 +308,7 @@ public void onDelete(
304308

305309
@Test
306310
@Order(3)
307-
public void testMetricsHttpResponseCodeGroupsEnabled() {
311+
public void testMetricsHttpResponseCodeGroupsEnabled() throws Exception {
308312
var configuration = new Configuration();
309313
configuration.set(
310314
KubernetesOperatorMetricOptions
@@ -348,6 +352,7 @@ public void testMetricsHttpResponseCodeGroupsEnabled() {
348352
.getMax());
349353

350354
kubernetesClient.resource(deployment).createOrReplace();
355+
Thread.sleep(500);
351356
assertEquals(
352357
1, listener.getCounter(listener.getMetricId(REQUEST_COUNTER_ID)).get().getCount());
353358
assertEquals(
@@ -381,13 +386,15 @@ public void testMetricsHttpResponseCodeGroupsEnabled() {
381386
> 0);
382387

383388
kubernetesClient.resource(deployment).delete();
389+
Thread.sleep(500);
384390
assertEquals(
385391
1,
386392
listener.getCounter(listener.getMetricId(REQUEST_DELETE_COUNTER_ID))
387393
.get()
388394
.getCount());
389395

390396
kubernetesClient.resource(deployment).delete();
397+
Thread.sleep(500);
391398
assertEquals(
392399
2,
393400
listener.getCounter(listener.getMetricId(REQUEST_DELETE_COUNTER_ID))

0 commit comments

Comments
 (0)