This is an automated email from the ASF dual-hosted git repository.
dmvk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 075f359fdbbe331c2ee93479204e7fec57fc9b8b
Author: David Moravek <d...@apache.org>
AuthorDate: Fri May 5 10:10:46 2023 +0200
[FLINK-32010][kubernetes] Rename KubernetesUtils#checkConfigMaps to
KubernetesUtils#getOnlyConfigMap to provide more clarity.
---
.../highavailability/KubernetesLeaderElectionDriver.java | 8 ++++----
.../highavailability/KubernetesLeaderRetrievalDriver.java | 4 ++--
.../KubernetesMultipleComponentLeaderElectionDriver.java | 8 ++++----
.../org/apache/flink/kubernetes/utils/KubernetesUtils.java | 12 ++++++++----
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriver.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriver.java
index 92c3a8345e6..ec0dfe30e46 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriver.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriver.java
@@ -44,8 +44,8 @@ import java.util.concurrent.ExecutorService;
import static
org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY;
import static org.apache.flink.kubernetes.utils.Constants.LEADER_ADDRESS_KEY;
import static
org.apache.flink.kubernetes.utils.Constants.LEADER_SESSION_ID_KEY;
-import static
org.apache.flink.kubernetes.utils.KubernetesUtils.checkConfigMaps;
import static
org.apache.flink.kubernetes.utils.KubernetesUtils.getLeaderInformationFromConfigMap;
+import static
org.apache.flink.kubernetes.utils.KubernetesUtils.getOnlyConfigMap;
import static org.apache.flink.util.Preconditions.checkNotNull;
/**
@@ -216,7 +216,7 @@ public class KubernetesLeaderElectionDriver implements
LeaderElectionDriver {
@Override
public void onModified(List<KubernetesConfigMap> configMaps) {
// We should only receive events for the watched ConfigMap
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
if (KubernetesLeaderElector.hasLeadership(configMap,
lockIdentity)) {
leaderElectionEventHandler.onLeaderInformationChange(
@@ -226,7 +226,7 @@ public class KubernetesLeaderElectionDriver implements
LeaderElectionDriver {
@Override
public void onDeleted(List<KubernetesConfigMap> configMaps) {
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
// The ConfigMap is deleted externally.
if (KubernetesLeaderElector.hasLeadership(configMap,
lockIdentity)) {
fatalErrorHandler.onFatalError(
@@ -237,7 +237,7 @@ public class KubernetesLeaderElectionDriver implements
LeaderElectionDriver {
@Override
public void onError(List<KubernetesConfigMap> configMaps) {
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
if (KubernetesLeaderElector.hasLeadership(configMap,
lockIdentity)) {
fatalErrorHandler.onFatalError(
new LeaderElectionException(
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriver.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriver.java
index 33e88ba903f..f08e4622165 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriver.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriver.java
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.concurrent.Executor;
import java.util.function.Function;
-import static
org.apache.flink.kubernetes.utils.KubernetesUtils.checkConfigMaps;
+import static
org.apache.flink.kubernetes.utils.KubernetesUtils.getOnlyConfigMap;
import static org.apache.flink.util.Preconditions.checkNotNull;
/**
@@ -105,7 +105,7 @@ public class KubernetesLeaderRetrievalDriver implements
LeaderRetrievalDriver {
@Override
public void onModified(List<KubernetesConfigMap> configMaps) {
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
leaderRetrievalEventHandler.notifyLeaderAddress(
leaderInformationExtractor.apply(configMap));
}
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriver.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriver.java
index e51e39a25f4..6a22ae0eb3b 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriver.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriver.java
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import static
org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY;
-import static
org.apache.flink.kubernetes.utils.KubernetesUtils.checkConfigMaps;
+import static
org.apache.flink.kubernetes.utils.KubernetesUtils.getOnlyConfigMap;
/** {@link MultipleComponentLeaderElectionDriver} for Kubernetes. */
public class KubernetesMultipleComponentLeaderElectionDriver
@@ -229,7 +229,7 @@ public class KubernetesMultipleComponentLeaderElectionDriver
@Override
public void onModified(List<KubernetesConfigMap> configMaps) {
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
if (KubernetesLeaderElector.hasLeadership(configMap,
lockIdentity)) {
Collection<LeaderInformationWithComponentId>
leaderInformationWithLeaderNames =
@@ -242,7 +242,7 @@ public class KubernetesMultipleComponentLeaderElectionDriver
@Override
public void onDeleted(List<KubernetesConfigMap> configMaps) {
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
if (KubernetesLeaderElector.hasLeadership(configMap,
lockIdentity)) {
fatalErrorHandler.onFatalError(
new LeaderElectionException(
@@ -254,7 +254,7 @@ public class KubernetesMultipleComponentLeaderElectionDriver
@Override
public void onError(List<KubernetesConfigMap> configMaps) {
- final KubernetesConfigMap configMap = checkConfigMaps(configMaps,
configMapName);
+ final KubernetesConfigMap configMap = getOnlyConfigMap(configMaps,
configMapName);
if (KubernetesLeaderElector.hasLeadership(configMap,
lockIdentity)) {
fatalErrorHandler.onFatalError(
new LeaderElectionException(
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
index 1d1d60700ee..4114f723386 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
@@ -209,11 +209,15 @@ public class KubernetesUtils {
* @param expectedConfigMapName expected ConfigMap Name
* @return Return the expected ConfigMap
*/
- public static KubernetesConfigMap checkConfigMaps(
+ public static KubernetesConfigMap getOnlyConfigMap(
List<KubernetesConfigMap> configMaps, String
expectedConfigMapName) {
- assert (configMaps.size() == 1);
- assert (configMaps.get(0).getName().equals(expectedConfigMapName));
- return configMaps.get(0);
+ if (configMaps.size() == 1 &&
expectedConfigMapName.equals(configMaps.get(0).getName())) {
+ return configMaps.get(0);
+ }
+ throw new IllegalStateException(
+ String.format(
+ "ConfigMap list should only contain a single ConfigMap
[%s].",
+ expectedConfigMapName));
}
/**
