You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gu...@apache.org on 2023/06/12 07:10:29 UTC
[flink] branch master updated (4e82ab0c37a -> 025a95b627f)
This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from 4e82ab0c37a [FLINK-31636][network] Introduce the TieredStoreResultSubpartitionView
new f2c49edc43f [FLINK-27925][kubernetes] refactor TestingWatchCallbackHandler for watch tm pod.
new 025a95b627f [FLINK-27925][kubernetes] adding the resourceVersion=0 when doing the list pods.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../kubeclient/Fabric8FlinkKubeClient.java | 14 +-
.../apache/flink/kubernetes/utils/Constants.java | 5 +
.../flink/kubernetes/KubernetesClientTestBase.java | 40 +++++
.../kubeclient/Fabric8FlinkKubeClientTest.java | 43 +++++
.../kubeclient/TestingWatchCallbackHandler.java | 128 ++++++++++++++
.../resources/KubernetesPodsWatcherTest.java | 72 +++-----
.../resources/KubernetesSharedInformerITCase.java | 194 +++++++++++----------
.../resources/NoOpWatchCallbackHandler.java | 55 ------
8 files changed, 356 insertions(+), 195 deletions(-)
create mode 100644 flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/TestingWatchCallbackHandler.java
delete mode 100644 flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/NoOpWatchCallbackHandler.java
[flink] 02/02: [FLINK-27925][kubernetes] adding the resourceVersion=0 when doing the list pods.
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 025a95b627faf8ec8b725a7784d1279b41e10ba7
Author: Mrart <mr...@gmail.com>
AuthorDate: Wed Jun 7 15:30:28 2023 +0800
[FLINK-27925][kubernetes] adding the resourceVersion=0 when doing the list pods.
---
.../kubeclient/Fabric8FlinkKubeClient.java | 14 ++++++-
.../apache/flink/kubernetes/utils/Constants.java | 5 +++
.../flink/kubernetes/KubernetesClientTestBase.java | 40 ++++++++++++++++++++
.../kubeclient/Fabric8FlinkKubeClientTest.java | 43 ++++++++++++++++++++++
4 files changed, 101 insertions(+), 1 deletion(-)
diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java
index 6d3854230ce..df841779762 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java
@@ -41,6 +41,7 @@ import org.apache.flink.util.concurrent.FutureUtils;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.ListOptionsBuilder;
import io.fabric8.kubernetes.api.model.OwnerReference;
import io.fabric8.kubernetes.api.model.OwnerReferenceBuilder;
import io.fabric8.kubernetes.api.model.Pod;
@@ -66,6 +67,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
+import static org.apache.flink.kubernetes.utils.Constants.KUBERNETES_ZERO_RESOURCE_VERSION;
import static org.apache.flink.util.Preconditions.checkNotNull;
/** The implementation of {@link FlinkKubeClient}. */
@@ -190,7 +192,15 @@ public class Fabric8FlinkKubeClient implements FlinkKubeClient {
@Override
public List<KubernetesPod> getPodsWithLabels(Map<String, String> labels) {
- final List<Pod> podList = this.internalClient.pods().withLabels(labels).list().getItems();
+ final List<Pod> podList =
+ this.internalClient
+ .pods()
+ .withLabels(labels)
+ .list(
+ new ListOptionsBuilder()
+ .withResourceVersion(KUBERNETES_ZERO_RESOURCE_VERSION)
+ .build())
+ .getItems();
if (podList == null || podList.isEmpty()) {
return new ArrayList<>();
@@ -231,6 +241,8 @@ public class Fabric8FlinkKubeClient implements FlinkKubeClient {
this.internalClient
.pods()
.withLabels(labels)
+ .withResourceVersion(
+ KUBERNETES_ZERO_RESOURCE_VERSION)
.watch(
new KubernetesPodsWatcher(
podCallbackHandler))),
diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/Constants.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/Constants.java
index 33959606bb7..257f4d7b0cc 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/Constants.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/Constants.java
@@ -115,4 +115,9 @@ public class Constants {
public static final String KUBERNETES_TASK_MANAGER_SCRIPT_PATH = "kubernetes-taskmanager.sh";
public static final String ENV_TM_JVM_MEM_OPTS = "FLINK_TM_JVM_MEM_OPTS";
+
+ // "resourceVersion="0" is any resource version.It saves time to access etcd and improves
+ // performance.
+ // https://kubernetes.io/docs/reference/using-api/api-concepts/#the-resourceversion-parameter
+ public static final String KUBERNETES_ZERO_RESOURCE_VERSION = "0";
}
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java
index a9d926c1924..8d9a4af663b 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java
@@ -33,12 +33,15 @@ import io.fabric8.kubernetes.api.model.NodeBuilder;
import io.fabric8.kubernetes.api.model.NodeListBuilder;
import io.fabric8.kubernetes.api.model.NodeSpecBuilder;
import io.fabric8.kubernetes.api.model.NodeStatusBuilder;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServicePort;
import io.fabric8.kubernetes.api.model.ServicePortBuilder;
import io.fabric8.kubernetes.api.model.ServiceStatus;
import io.fabric8.kubernetes.api.model.ServiceStatusBuilder;
+import io.fabric8.kubernetes.api.model.WatchEvent;
import io.fabric8.mockwebserver.dsl.DelayPathable;
import io.fabric8.mockwebserver.dsl.HttpMethodable;
import io.fabric8.mockwebserver.dsl.MockServerExpectation;
@@ -51,7 +54,9 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* Base class for {@link KubernetesClusterDescriptorTest} and {@link
@@ -61,6 +66,7 @@ public class KubernetesClientTestBase extends KubernetesTestBase {
protected static final int REST_PORT = 9021;
protected static final int NODE_PORT = 31234;
+ protected static final Long EVENT_WAIT_PERIOD_MS = 10L;
protected void mockExpectedNodesFromServerSide(List<String> addresses) {
final List<Node> nodes = new ArrayList<>();
@@ -143,6 +149,40 @@ public class KubernetesClientTestBase extends KubernetesTestBase {
server.expect().get().withPath(path).andReturn(500, "Expected error").always();
}
+ protected void mockPodEventWithLabels(
+ String namespace, String podName, String resourceVersion, Map<String, String> labels) {
+ final Pod pod =
+ new PodBuilder()
+ .withNewMetadata()
+ .withNamespace(namespace)
+ .withName(podName)
+ .withLabels(labels)
+ .withResourceVersion("5668")
+ .endMetadata()
+ .build();
+ // mock four kinds of events.
+ String mockPath =
+ String.format(
+ "/api/v1/namespaces/%s/pods?labelSelector=%s&resourceVersion=%s&allowWatchBookmarks=true&watch=true",
+ namespace,
+ labels.entrySet().stream()
+ .map(entry -> entry.getKey() + "%3D" + entry.getValue())
+ .collect(Collectors.joining("%2C")),
+ resourceVersion);
+ server.expect()
+ .withPath(mockPath)
+ .andUpgradeToWebSocket()
+ .open()
+ .waitFor(EVENT_WAIT_PERIOD_MS)
+ .andEmit(new WatchEvent(pod, "ADDED"))
+ .waitFor(EVENT_WAIT_PERIOD_MS)
+ .andEmit(new WatchEvent(pod, "MODIFIED"))
+ .waitFor(EVENT_WAIT_PERIOD_MS)
+ .andEmit(new WatchEvent(pod, "DELETED"))
+ .done()
+ .once();
+ }
+
protected Service buildExternalServiceWithLoadBalancer(
@Nullable String hostname, @Nullable String ip) {
final ServicePort servicePort =
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClientTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClientTest.java
index 2e03924de55..36d182247b2 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClientTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClientTest.java
@@ -47,6 +47,7 @@ import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.client.Watcher.Action;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -55,6 +56,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -65,6 +67,7 @@ import static org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches;
import static org.apache.flink.core.testutils.FlinkAssertions.assertThatChainOfCauses;
import static org.apache.flink.kubernetes.utils.Constants.CONFIG_FILE_LOG4J_NAME;
import static org.apache.flink.kubernetes.utils.Constants.CONFIG_FILE_LOGBACK_NAME;
+import static org.apache.flink.kubernetes.utils.Constants.KUBERNETES_ZERO_RESOURCE_VERSION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.fail;
@@ -277,6 +280,25 @@ public class Fabric8FlinkKubeClientTest extends KubernetesClientTestBase {
assertThat(this.kubeClient.pods().inNamespace(NAMESPACE).withName(podName).get()).isNull();
}
+ @Test
+ void testGetPodsWithLabels() {
+ final String podName = "pod-with-labels";
+ final Pod pod =
+ new PodBuilder()
+ .editOrNewMetadata()
+ .withName(podName)
+ .withLabels(TESTING_LABELS)
+ .endMetadata()
+ .editOrNewSpec()
+ .endSpec()
+ .build();
+ this.kubeClient.pods().inNamespace(NAMESPACE).create(pod);
+ List<KubernetesPod> kubernetesPods = this.flinkKubeClient.getPodsWithLabels(TESTING_LABELS);
+ assertThat(kubernetesPods)
+ .satisfiesExactly(
+ kubernetesPod -> assertThat(kubernetesPod.getName()).isEqualTo(podName));
+ }
+
@Test
void testServiceLoadBalancerWithNoIP() {
final String hostName = "test-host-name";
@@ -411,6 +433,27 @@ public class Fabric8FlinkKubeClientTest extends KubernetesClientTestBase {
.isEmpty();
}
+ @Test
+ void testWatchPodsAndDoCallback() throws Exception {
+ mockPodEventWithLabels(
+ NAMESPACE, TASKMANAGER_POD_NAME, KUBERNETES_ZERO_RESOURCE_VERSION, TESTING_LABELS);
+ // the count latch for events.
+ CompletableFuture<Action> podAddedAction = new CompletableFuture();
+ CompletableFuture<Action> podDeletedAction = new CompletableFuture();
+ CompletableFuture<Action> podModifiedAction = new CompletableFuture();
+ TestingWatchCallbackHandler<KubernetesPod> watchCallbackHandler =
+ TestingWatchCallbackHandler.<KubernetesPod>builder()
+ .setOnAddedConsumer((ignore) -> podAddedAction.complete(Action.ADDED))
+ .setOnDeletedConsumer((ignore) -> podDeletedAction.complete(Action.DELETED))
+ .setOnModifiedConsumer(
+ (ignore) -> podModifiedAction.complete(Action.MODIFIED))
+ .build();
+ this.flinkKubeClient.watchPodsAndDoCallback(TESTING_LABELS, watchCallbackHandler);
+ assertThat(podAddedAction.get()).isEqualTo(Action.ADDED);
+ assertThat(podDeletedAction.get()).isEqualTo(Action.DELETED);
+ assertThat(podModifiedAction.get()).isEqualTo(Action.MODIFIED);
+ }
+
@Test
void testCreateConfigMap() throws Exception {
final KubernetesConfigMap configMap = buildTestingConfigMap();
[flink] 01/02: [FLINK-27925][kubernetes] refactor TestingWatchCallbackHandler for watch tm pod.
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit f2c49edc43ff5d3f4d2a5e90729dd0cb2232df6c
Author: Mrart <mr...@gmail.com>
AuthorDate: Wed Jun 7 15:29:59 2023 +0800
[FLINK-27925][kubernetes] refactor TestingWatchCallbackHandler for watch tm pod.
---
.../kubeclient/TestingWatchCallbackHandler.java | 128 ++++++++++++++
.../resources/KubernetesPodsWatcherTest.java | 72 +++-----
.../resources/KubernetesSharedInformerITCase.java | 194 +++++++++++----------
.../resources/NoOpWatchCallbackHandler.java | 55 ------
4 files changed, 255 insertions(+), 194 deletions(-)
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/TestingWatchCallbackHandler.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/TestingWatchCallbackHandler.java
new file mode 100644
index 00000000000..c51a545f387
--- /dev/null
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/TestingWatchCallbackHandler.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient;
+
+import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient.WatchCallbackHandler;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+/** Mock {@link WatchCallbackHandler} for testing. */
+public class TestingWatchCallbackHandler<T> implements WatchCallbackHandler<T> {
+ private final Consumer<List<T>> onAddedConsumer;
+
+ private final Consumer<List<T>> onModifiedConsumer;
+
+ private final Consumer<List<T>> onDeletedConsumer;
+
+ private final Consumer<List<T>> onErrorConsumer;
+
+ private final Consumer<Throwable> handleErrorConsumer;
+
+ private TestingWatchCallbackHandler(
+ Consumer<List<T>> onAddedConsumer,
+ Consumer<List<T>> onModifiedConsumer,
+ Consumer<List<T>> onDeletedConsumer,
+ Consumer<List<T>> onErrorConsumer,
+ Consumer<Throwable> handleErrorConsumer) {
+ this.onAddedConsumer = onAddedConsumer;
+ this.onModifiedConsumer = onModifiedConsumer;
+ this.onDeletedConsumer = onDeletedConsumer;
+ this.onErrorConsumer = onErrorConsumer;
+ this.handleErrorConsumer = handleErrorConsumer;
+ }
+
+ @Override
+ public void onAdded(List<T> resources) {
+ onAddedConsumer.accept(resources);
+ }
+
+ @Override
+ public void onModified(List<T> resources) {
+ onModifiedConsumer.accept(resources);
+ }
+
+ @Override
+ public void onDeleted(List<T> resources) {
+ onDeletedConsumer.accept(resources);
+ }
+
+ @Override
+ public void onError(List<T> resources) {
+ onErrorConsumer.accept(resources);
+ }
+
+ @Override
+ public void handleError(Throwable throwable) {
+ handleErrorConsumer.accept(throwable);
+ }
+
+ public static <T> Builder<T> builder() {
+ return new Builder<>();
+ }
+
+ /** Builder for {@link TestingWatchCallbackHandler}. */
+ public static class Builder<T> {
+ private Consumer<List<T>> onAddedConsumer = (ignore) -> {};
+
+ private Consumer<List<T>> onModifiedConsumer = (ignore) -> {};
+
+ private Consumer<List<T>> onDeletedConsumer = (ignore) -> {};
+
+ private Consumer<List<T>> onErrorConsumer = (ignore) -> {};
+
+ private Consumer<Throwable> handleErrorConsumer = (ignore) -> {};
+
+ private Builder() {}
+
+ public Builder<T> setOnAddedConsumer(Consumer<List<T>> onAddedConsumer) {
+ this.onAddedConsumer = onAddedConsumer;
+ return this;
+ }
+
+ public Builder<T> setOnModifiedConsumer(Consumer<List<T>> onModifiedConsumer) {
+ this.onModifiedConsumer = onModifiedConsumer;
+ return this;
+ }
+
+ public Builder<T> setOnDeletedConsumer(Consumer<List<T>> onDeletedConsumer) {
+ this.onDeletedConsumer = onDeletedConsumer;
+ return this;
+ }
+
+ public Builder<T> setOnErrorConsumer(Consumer<List<T>> onErrorConsumer) {
+ this.onErrorConsumer = onErrorConsumer;
+ return this;
+ }
+
+ public Builder<T> setHandleErrorConsumer(Consumer<Throwable> handleErrorConsumer) {
+ this.handleErrorConsumer = handleErrorConsumer;
+ return this;
+ }
+
+ public TestingWatchCallbackHandler<T> build() {
+ return new TestingWatchCallbackHandler<>(
+ onAddedConsumer,
+ onModifiedConsumer,
+ onDeletedConsumer,
+ onErrorConsumer,
+ handleErrorConsumer);
+ }
+ }
+}
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesPodsWatcherTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesPodsWatcherTest.java
index f94caf85a04..905d236ebf2 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesPodsWatcherTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesPodsWatcherTest.java
@@ -18,8 +18,8 @@
package org.apache.flink.kubernetes.kubeclient.resources;
-import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.TestingWatchCallbackHandler;
import io.fabric8.kubernetes.api.model.StatusBuilder;
import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
import static java.net.HttpURLConnection.HTTP_GONE;
import static org.assertj.core.api.Assertions.assertThat;
@@ -48,7 +47,9 @@ class KubernetesPodsWatcherTest {
void testClosingWithNullException() {
final KubernetesPodsWatcher podsWatcher =
new KubernetesPodsWatcher(
- new TestingCallbackHandler(e -> fail("Should not reach here.")));
+ TestingWatchCallbackHandler.<KubernetesPod>builder()
+ .setHandleErrorConsumer(e -> fail("Should not reach here."))
+ .build());
podsWatcher.onClose(null);
}
@@ -56,7 +57,10 @@ class KubernetesPodsWatcherTest {
void testClosingWithException() {
final AtomicBoolean called = new AtomicBoolean(false);
final KubernetesPodsWatcher podsWatcher =
- new KubernetesPodsWatcher(new TestingCallbackHandler(e -> called.set(true)));
+ new KubernetesPodsWatcher(
+ TestingWatchCallbackHandler.<KubernetesPod>builder()
+ .setHandleErrorConsumer(e -> called.set(true))
+ .build());
podsWatcher.onClose(new WatcherException("exception"));
assertThat(called.get()).isTrue();
}
@@ -65,7 +69,13 @@ class KubernetesPodsWatcherTest {
void testCallbackHandler() {
FlinkPod pod = new FlinkPod.Builder().build();
final KubernetesPodsWatcher podsWatcher =
- new KubernetesPodsWatcher(new TestingCallbackHandler(e -> {}));
+ new KubernetesPodsWatcher(
+ TestingWatchCallbackHandler.<KubernetesPod>builder()
+ .setOnAddedConsumer(pods -> podAddedList.addAll(pods))
+ .setOnModifiedConsumer(pods -> podModifiedList.addAll(pods))
+ .setOnDeletedConsumer(pods -> podDeletedList.addAll(pods))
+ .setOnErrorConsumer(pods -> podErrorList.addAll(pods))
+ .build());
podsWatcher.eventReceived(Watcher.Action.ADDED, pod.getPodWithoutMainContainer());
podsWatcher.eventReceived(Watcher.Action.MODIFIED, pod.getPodWithoutMainContainer());
podsWatcher.eventReceived(Watcher.Action.DELETED, pod.getPodWithoutMainContainer());
@@ -82,52 +92,20 @@ class KubernetesPodsWatcherTest {
final String errMsg = "too old resource version";
final KubernetesPodsWatcher podsWatcher =
new KubernetesPodsWatcher(
- new TestingCallbackHandler(
- e -> {
- assertThat(e)
- .isInstanceOf(
- KubernetesTooOldResourceVersionException.class)
- .hasMessageContaining(errMsg);
- }));
+ TestingWatchCallbackHandler.<KubernetesPod>builder()
+ .setHandleErrorConsumer(
+ e -> {
+ assertThat(e)
+ .isInstanceOf(
+ KubernetesTooOldResourceVersionException
+ .class)
+ .hasMessageContaining(errMsg);
+ })
+ .build());
podsWatcher.onClose(
new WatcherException(
errMsg,
new KubernetesClientException(
errMsg, HTTP_GONE, new StatusBuilder().build())));
}
-
- private class TestingCallbackHandler
- implements FlinkKubeClient.WatchCallbackHandler<KubernetesPod> {
-
- final Consumer<Throwable> consumer;
-
- TestingCallbackHandler(Consumer<Throwable> consumer) {
- this.consumer = consumer;
- }
-
- @Override
- public void onAdded(List<KubernetesPod> pods) {
- podAddedList.addAll(pods);
- }
-
- @Override
- public void onModified(List<KubernetesPod> pods) {
- podModifiedList.addAll(pods);
- }
-
- @Override
- public void onDeleted(List<KubernetesPod> pods) {
- podDeletedList.addAll(pods);
- }
-
- @Override
- public void onError(List<KubernetesPod> pods) {
- podErrorList.addAll(pods);
- }
-
- @Override
- public void handleError(Throwable throwable) {
- consumer.accept(throwable);
- }
- }
}
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java
index 3d3d5b3e02a..b48677da8d4 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java
@@ -22,6 +22,7 @@ import org.apache.flink.kubernetes.KubernetesExtension;
import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
import org.apache.flink.kubernetes.kubeclient.KubernetesConfigMapSharedWatcher;
import org.apache.flink.kubernetes.kubeclient.KubernetesSharedWatcher.Watch;
+import org.apache.flink.kubernetes.kubeclient.TestingWatchCallbackHandler;
import org.apache.flink.util.ExecutorUtils;
import org.apache.flink.util.concurrent.ExecutorThreadFactory;
@@ -59,6 +60,8 @@ class KubernetesSharedInformerITCase {
private FlinkKubeClient client;
private ExecutorService watchCallbackExecutorService;
+ private static volatile Long blockVal = 0L;
+
@BeforeEach
void setUp() throws Exception {
client = kubernetesExtension.getFlinkKubeClient();
@@ -121,18 +124,38 @@ class KubernetesSharedInformerITCase {
final String configMapName = getConfigMapName(System.currentTimeMillis());
final long block = 500;
final long maxUpdateVal = 30;
- final TestingBlockCallbackHandler handler =
- new TestingBlockCallbackHandler(block, maxUpdateVal);
+
+ final CompletableFuture<Void> expectedFuture = new CompletableFuture<>();
+ final CompletableFuture<Void> assertFuture = new CompletableFuture<>();
+ final TestingWatchCallbackHandler handler =
+ TestingWatchCallbackHandler.<KubernetesConfigMap>builder()
+ .setOnAddedConsumer(
+ (resources) ->
+ onAddedOrModified(
+ resources,
+ maxUpdateVal,
+ block,
+ expectedFuture,
+ assertFuture))
+ .setOnModifiedConsumer(
+ (resources) ->
+ onAddedOrModified(
+ resources,
+ maxUpdateVal,
+ block,
+ expectedFuture,
+ assertFuture))
+ .build();
final Watch watch = watcher.watch(configMapName, handler, watchCallbackExecutorService);
createConfigMap(configMapName);
for (int i = 1; i <= maxUpdateVal; i++) {
updateConfigMap(configMapName, ImmutableMap.of("val", String.valueOf(i)));
}
- assertThatCode(() -> handler.expectedFuture.get(120, TimeUnit.SECONDS))
- .as("expected value: " + maxUpdateVal + ", actual: " + handler.val)
+ assertThatCode(() -> expectedFuture.get(120, TimeUnit.SECONDS))
+ .as("expected value: " + maxUpdateVal + ", actual: " + blockVal)
.doesNotThrowAnyException();
try {
- handler.assertFuture.get(2 * block, TimeUnit.MILLISECONDS);
+ assertFuture.get(2 * block, TimeUnit.MILLISECONDS);
} catch (TimeoutException e) {
// expected
}
@@ -187,7 +210,7 @@ class KubernetesSharedInformerITCase {
final String name = getConfigMapName(i % 10);
final TestingCallbackHandler handler = new TestingCallbackHandler(name);
callbackHandlers.add(handler);
- final Watch watch = watcher.watch(name, handler, watchCallbackExecutorService);
+ final Watch watch = watcher.watch(name, handler.build(), watchCallbackExecutorService);
watchers.add(watch);
}
}
@@ -196,8 +219,7 @@ class KubernetesSharedInformerITCase {
return "shared-informer-test-cluster-" + id;
}
- private static final class TestingCallbackHandler
- extends NoOpWatchCallbackHandler<KubernetesConfigMap> {
+ private static final class TestingCallbackHandler {
private final CompletableFuture<Void> addFuture = new CompletableFuture<>();
private final CompletableFuture<Void> addOrUpdateFuture = new CompletableFuture<>();
@@ -210,96 +232,84 @@ class KubernetesSharedInformerITCase {
this.resourceName = resourceName;
}
- @Override
- public void onAdded(List<KubernetesConfigMap> resources) {
- final KubernetesConfigMap kubernetesConfigMap = resources.get(0);
- check(
- assertFuture,
- () -> {
- assertThat(kubernetesConfigMap.getName()).isEqualTo(resourceName);
- assertThat(addFuture).isNotDone();
- assertThat(addOrUpdateFuture).isNotDone();
- });
- addFuture.complete(null);
- final String foo = kubernetesConfigMap.getData().get("foo");
- if (foo != null) {
- check(assertFuture, () -> assertThat(foo).isEqualTo("bar"));
- addOrUpdateFuture.complete(null);
- }
- }
-
- @Override
- public void onModified(List<KubernetesConfigMap> resources) {
- final KubernetesConfigMap kubernetesConfigMap = resources.get(0);
- final String foo = kubernetesConfigMap.getData().get("foo");
- check(
- assertFuture,
- () -> {
- assertThat(kubernetesConfigMap.getName()).isEqualTo(resourceName);
- assertThat(foo).isEqualTo("bar");
- assertThat(addFuture).isDone();
- });
- if (addOrUpdateFuture.isDone()) {
- check(assertFuture, () -> assertThat(isDeleting(kubernetesConfigMap)).isTrue());
- } else {
- addOrUpdateFuture.complete(null);
- }
- }
-
- @Override
- public void onDeleted(List<KubernetesConfigMap> resources) {
- check(assertFuture, () -> assertThat(deleteFuture).isNotDone());
- deleteFuture.complete(null);
+ private TestingWatchCallbackHandler build() {
+ return TestingWatchCallbackHandler.<KubernetesConfigMap>builder()
+ .setOnAddedConsumer(
+ resources -> {
+ final KubernetesConfigMap kubernetesConfigMap = resources.get(0);
+ check(
+ assertFuture,
+ () -> {
+ assertThat(kubernetesConfigMap.getName())
+ .isEqualTo(resourceName);
+ assertThat(addFuture).isNotDone();
+ assertThat(addOrUpdateFuture).isNotDone();
+ });
+ addFuture.complete(null);
+ final String foo = kubernetesConfigMap.getData().get("foo");
+ if (foo != null) {
+ check(assertFuture, () -> assertThat(foo).isEqualTo("bar"));
+ addOrUpdateFuture.complete(null);
+ }
+ })
+ .setOnModifiedConsumer(
+ (resources) -> {
+ final KubernetesConfigMap kubernetesConfigMap = resources.get(0);
+ final String foo = kubernetesConfigMap.getData().get("foo");
+ check(
+ assertFuture,
+ () -> {
+ assertThat(kubernetesConfigMap.getName())
+ .isEqualTo(resourceName);
+ assertThat(foo).isEqualTo("bar");
+ assertThat(addFuture).isDone();
+ });
+ if (addOrUpdateFuture.isDone()) {
+ check(
+ assertFuture,
+ () ->
+ assertThat(isDeleting(kubernetesConfigMap))
+ .isTrue());
+ } else {
+ addOrUpdateFuture.complete(null);
+ }
+ })
+ .setOnDeletedConsumer(
+ resources -> {
+ check(assertFuture, () -> assertThat(deleteFuture).isNotDone());
+ deleteFuture.complete(null);
+ })
+ .build();
}
}
- private static final class TestingBlockCallbackHandler
- extends NoOpWatchCallbackHandler<KubernetesConfigMap> {
- private final CompletableFuture<Void> expectedFuture = new CompletableFuture<>();
- private final CompletableFuture<Void> assertFuture = new CompletableFuture<>();
- private final long block;
- private final long expected;
-
- private volatile long val = 0;
-
- public TestingBlockCallbackHandler(long block, long expected) {
- this.block = block;
- this.expected = expected;
+ private static void onAddedOrModified(
+ List<KubernetesConfigMap> resources,
+ Long expected,
+ Long block,
+ CompletableFuture expectedFuture,
+ CompletableFuture assertFuture) {
+ final KubernetesConfigMap kubernetesConfigMap = resources.get(0);
+ final String valData = kubernetesConfigMap.getData().get("val");
+ if (valData == null) {
+ return;
}
-
- @Override
- public void onAdded(List<KubernetesConfigMap> resources) {
- onAddedOrModified(resources);
- }
-
- @Override
- public void onModified(List<KubernetesConfigMap> resources) {
- onAddedOrModified(resources);
- }
-
- private void onAddedOrModified(List<KubernetesConfigMap> resources) {
- final KubernetesConfigMap kubernetesConfigMap = resources.get(0);
- final String valData = kubernetesConfigMap.getData().get("val");
- if (valData == null) {
- return;
- }
- final long newVal = Long.parseLong(valData);
- check(
- assertFuture,
- () -> assertThat(newVal > val || isDeleting(kubernetesConfigMap)).isTrue());
- val = newVal;
- block();
- if (expected == val) {
- expectedFuture.complete(null);
- }
+ final long newVal = Long.parseLong(valData);
+ check(
+ assertFuture,
+ () -> assertThat(newVal > blockVal || isDeleting(kubernetesConfigMap)).isTrue());
+ blockVal = newVal;
+ block(block);
+ if (expected == blockVal) {
+ expectedFuture.complete(null);
}
+ }
- private void block() {
- try {
- Thread.sleep(block);
- } catch (InterruptedException e) {
- // ignore
- }
+ private static void block(Long block) {
+ try {
+ Thread.sleep(block);
+ } catch (InterruptedException e) {
+ // ignore
}
}
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/NoOpWatchCallbackHandler.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/NoOpWatchCallbackHandler.java
deleted file mode 100644
index 85988868b30..00000000000
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/NoOpWatchCallbackHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.kubernetes.kubeclient.resources;
-
-import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
-
-import java.util.List;
-
-/**
- * Empty implementation of {@link FlinkKubeClient.WatchCallbackHandler}.
- *
- * @param <T> Type of resource to be watched
- */
-public class NoOpWatchCallbackHandler<T> implements FlinkKubeClient.WatchCallbackHandler<T> {
- @Override
- public void onAdded(List<T> resources) {
- // noop
- }
-
- @Override
- public void onModified(List<T> resources) {
- // noop
- }
-
- @Override
- public void onDeleted(List<T> resources) {
- // noop
- }
-
- @Override
- public void onError(List<T> resources) {
- // noop
- }
-
- @Override
- public void handleError(Throwable throwable) {
- // noop
- }
-}