Skip to content

[SPARK-49019] Use try-with-resources to test KubernetesClientFactory.buildKubernetesClient #25

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

Closed
wants to merge 1 commit into from
Closed

[SPARK-49019] Use try-with-resources to test KubernetesClientFactory.buildKubernetesClient #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 45 additions & 42 deletions ...t/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,59 +68,62 @@ void cleanUp() {
void testMetricsEnabled() {
KubernetesMetricsInterceptor metricsInterceptor = new KubernetesMetricsInterceptor();
List<Interceptor> interceptors = Collections.singletonList(metricsInterceptor);
KubernetesClient client =
try (KubernetesClient client =
KubernetesClientFactory.buildKubernetesClient(
interceptors, kubernetesClient.getConfiguration());
SparkApplication sparkApplication = createSparkApplication();
ConfigMap configMap = createConfigMap();
interceptors, kubernetesClient.getConfiguration())) {
SparkApplication sparkApplication = createSparkApplication();
ConfigMap configMap = createConfigMap();

Map<String, Metric> metrics = new HashMap<>(metricsInterceptor.metricRegistry().getMetrics());
Assertions.assertEquals(9, metrics.size());
client.resource(sparkApplication).create();
client.resource(configMap).get();
Map<String, Metric> metrics2 = new HashMap<>(metricsInterceptor.metricRegistry().getMetrics());
Assertions.assertEquals(17, metrics2.size());
List<String> expectedMetricsName =
Arrays.asList(
"http.response.201",
"http.request.post",
"sparkapplications.post",
"spark-test.sparkapplications.post",
"spark-test.sparkapplications.post",
"configmaps.get",
"spark-system.configmaps.get",
"2xx",
"4xx");
expectedMetricsName.stream()
.forEach(
name -> {
Meter metric = (Meter) metrics2.get(name);
Assertions.assertEquals(metric.getCount(), 1);
});
client.resource(sparkApplication).delete();
Map<String, Metric> metrics = new HashMap<>(metricsInterceptor.metricRegistry().getMetrics());
Assertions.assertEquals(9, metrics.size());
client.resource(sparkApplication).create();
client.resource(configMap).get();
Map<String, Metric> metrics2 =
new HashMap<>(metricsInterceptor.metricRegistry().getMetrics());
Assertions.assertEquals(17, metrics2.size());
List<String> expectedMetricsName =
Arrays.asList(
"http.response.201",
"http.request.post",
"sparkapplications.post",
"spark-test.sparkapplications.post",
"spark-test.sparkapplications.post",
"configmaps.get",
"spark-system.configmaps.get",
"2xx",
"4xx");
expectedMetricsName.stream()
.forEach(
name -> {
Meter metric = (Meter) metrics2.get(name);
Assertions.assertEquals(metric.getCount(), 1);
});
client.resource(sparkApplication).delete();
}
}

@Test
@Order(2)
void testWhenKubernetesServerNotWorking() {
KubernetesMetricsInterceptor metricsInterceptor = new KubernetesMetricsInterceptor();
List<Interceptor> interceptors = Collections.singletonList(metricsInterceptor);
KubernetesClient client =
try (KubernetesClient client =
KubernetesClientFactory.buildKubernetesClient(
interceptors, kubernetesClient.getConfiguration());
int retry = client.getConfiguration().getRequestRetryBackoffLimit();
mockServer.shutdown();
SparkApplication sparkApplication = createSparkApplication();
assertThrows(
Exception.class,
() -> {
client.resource(sparkApplication).create();
});
interceptors, kubernetesClient.getConfiguration())) {
int retry = client.getConfiguration().getRequestRetryBackoffLimit();
mockServer.shutdown();
SparkApplication sparkApplication = createSparkApplication();
assertThrows(
Exception.class,
() -> {
client.resource(sparkApplication).create();
});

Map<String, Metric> map = metricsInterceptor.metricRegistry().getMetrics();
Assertions.assertEquals(12, map.size());
Meter metric = (Meter) map.get("failed");
Assertions.assertEquals(metric.getCount(), retry + 1);
Map<String, Metric> map = metricsInterceptor.metricRegistry().getMetrics();
Assertions.assertEquals(12, map.size());
Meter metric = (Meter) map.get("failed");
Assertions.assertEquals(metric.getCount(), retry + 1);
}
}

private static SparkApplication createSparkApplication() {
Expand Down