You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/06/20 15:22:43 UTC

[flink] branch master updated (d7f2ec3414c -> f1ca261e1e9)

This is an automated email from the ASF dual-hosted git repository.

mapohl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


    from d7f2ec3414c [FLINK-27243][table] Support SHOW PARTITIONS statement for partitioned table (#22721)
     new 02629a8428f [hotfix][runtime] Removes unused driver
     new f1ca261e1e9 [FLINK-30344][test] Migrates KubernetesHighAvailabilityTestBase-related tests to the MultipleComponentLeaderElectionDriver interface

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:
 ...sMultipleComponentLeaderElectionHaServices.java |   1 -
 ...tipleComponentLeaderRetrievalDriverFactory.java |   5 -
 .../KubernetesCheckpointIDCounterTest.java         |   7 +-
 .../KubernetesHighAvailabilityTestBase.java        |  87 +++++++++---
 .../KubernetesLeaderElectionDriverTest.java        | 153 +++++++++++----------
 .../KubernetesLeaderRetrievalDriverTest.java       |   7 +-
 ...sMultipleComponentLeaderElectionDriverTest.java |   1 -
 .../KubernetesStateHandleStoreTest.java            |   7 +-
 8 files changed, 162 insertions(+), 106 deletions(-)


[flink] 01/02: [hotfix][runtime] Removes unused driver

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 02629a8428f4815197c4f995ff53a884bd515081
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Thu May 25 16:56:53 2023 +0200

    [hotfix][runtime] Removes unused driver
    
    Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
 .../KubernetesMultipleComponentLeaderElectionHaServices.java         | 1 -
 .../KubernetesMultipleComponentLeaderRetrievalDriverFactory.java     | 5 -----
 .../KubernetesMultipleComponentLeaderElectionDriverTest.java         | 1 -
 3 files changed, 7 deletions(-)

diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java
index 9092bf1eac5..9a77040a125 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java
@@ -143,7 +143,6 @@ public class KubernetesMultipleComponentLeaderElectionHaServices extends Abstrac
     protected LeaderRetrievalService createLeaderRetrievalService(String componentId) {
         return new DefaultLeaderRetrievalService(
                 new KubernetesMultipleComponentLeaderRetrievalDriverFactory(
-                        kubeClient,
                         configMapSharedWatcher,
                         watchExecutorService,
                         getClusterConfigMap(),
diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java
index 44aaf7210e8..ae72f9c5a3c 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.kubernetes.highavailability;
 
-import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.KubernetesConfigMapSharedWatcher;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesConfigMap;
 import org.apache.flink.kubernetes.utils.KubernetesUtils;
@@ -39,8 +38,6 @@ import java.util.concurrent.Executor;
 public class KubernetesMultipleComponentLeaderRetrievalDriverFactory
         implements LeaderRetrievalDriverFactory {
 
-    private final FlinkKubeClient kubeClient;
-
     private final KubernetesConfigMapSharedWatcher configMapSharedWatcher;
 
     private final Executor watchExecutor;
@@ -50,12 +47,10 @@ public class KubernetesMultipleComponentLeaderRetrievalDriverFactory
     private final String componentId;
 
     public KubernetesMultipleComponentLeaderRetrievalDriverFactory(
-            FlinkKubeClient kubeClient,
             KubernetesConfigMapSharedWatcher configMapSharedWatcher,
             Executor watchExecutor,
             String configMapName,
             String componentId) {
-        this.kubeClient = Preconditions.checkNotNull(kubeClient);
         this.configMapSharedWatcher = Preconditions.checkNotNull(configMapSharedWatcher);
         this.watchExecutor = Preconditions.checkNotNull(watchExecutor);
         this.configMapName = Preconditions.checkNotNull(configMapName);
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java
index a03c5c3b5ef..3f2edb8f658 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java
@@ -101,7 +101,6 @@ class KubernetesMultipleComponentLeaderElectionDriverTest {
                             final DefaultLeaderRetrievalService leaderRetrievalService =
                                     new DefaultLeaderRetrievalService(
                                             new KubernetesMultipleComponentLeaderRetrievalDriverFactory(
-                                                    getFlinkKubeClient(),
                                                     getConfigMapSharedWatcher(),
                                                     testExecutorExtension.getExecutor(),
                                                     LEADER_CONFIGMAP_NAME,


[flink] 02/02: [FLINK-30344][test] Migrates KubernetesHighAvailabilityTestBase-related tests to the MultipleComponentLeaderElectionDriver interface

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit f1ca261e1e917fa1c79715ff6ed415076aa4295a
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Mon Jun 19 18:30:26 2023 +0200

    [FLINK-30344][test] Migrates KubernetesHighAvailabilityTestBase-related tests to the MultipleComponentLeaderElectionDriver interface
    
    Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
 .../KubernetesCheckpointIDCounterTest.java         |   7 +-
 .../KubernetesHighAvailabilityTestBase.java        |  87 +++++++++---
 .../KubernetesLeaderElectionDriverTest.java        | 153 +++++++++++----------
 .../KubernetesLeaderRetrievalDriverTest.java       |   7 +-
 .../KubernetesStateHandleStoreTest.java            |   7 +-
 5 files changed, 162 insertions(+), 99 deletions(-)

diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesCheckpointIDCounterTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesCheckpointIDCounterTest.java
index 953cd7522dc..fea8f464ccd 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesCheckpointIDCounterTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesCheckpointIDCounterTest.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.common.JobStatus;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesLeaderElector;
 import org.apache.flink.kubernetes.utils.Constants;
 import org.apache.flink.kubernetes.utils.KubernetesUtils;
+import org.apache.flink.runtime.leaderelection.LeaderElectionEvent;
 
 import org.junit.jupiter.api.Test;
 
@@ -185,7 +186,8 @@ class KubernetesCheckpointIDCounterTest extends KubernetesHighAvailabilityTestBa
 
                             // lost leadership
                             getLeaderCallback().notLeader();
-                            electionEventHandler.waitForRevokeLeader();
+
+                            electionEventHandler.await(LeaderElectionEvent.NotLeaderEvent.class);
                             getLeaderConfigMap()
                                     .getAnnotations()
                                     .remove(KubernetesLeaderElector.LEADER_ANNOTATION_KEY);
@@ -260,7 +262,8 @@ class KubernetesCheckpointIDCounterTest extends KubernetesHighAvailabilityTestBa
 
                             // lost leadership
                             getLeaderCallback().notLeader();
-                            electionEventHandler.waitForRevokeLeader();
+                            electionEventHandler.await(LeaderElectionEvent.NotLeaderEvent.class);
+
                             getLeaderConfigMap()
                                     .getAnnotations()
                                     .remove(KubernetesLeaderElector.LEADER_ANNOTATION_KEY);
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityTestBase.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityTestBase.java
index b898338f5db..4b40c6c9e65 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityTestBase.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityTestBase.java
@@ -24,10 +24,14 @@ import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.TestingFlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesConfigMap;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesLeaderElector;
-import org.apache.flink.runtime.leaderelection.LeaderElectionDriver;
-import org.apache.flink.runtime.leaderelection.TestingLeaderElectionEventHandler;
+import org.apache.flink.kubernetes.utils.KubernetesUtils;
+import org.apache.flink.runtime.leaderelection.LeaderElectionEvent;
+import org.apache.flink.runtime.leaderelection.LeaderInformation;
+import org.apache.flink.runtime.leaderelection.MultipleComponentLeaderElectionDriver;
+import org.apache.flink.runtime.leaderelection.TestingLeaderElectionListener;
 import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalDriver;
 import org.apache.flink.runtime.leaderretrieval.TestingLeaderRetrievalEventHandler;
+import org.apache.flink.runtime.util.TestingFatalErrorHandler;
 import org.apache.flink.util.ExecutorUtils;
 import org.apache.flink.util.concurrent.ExecutorThreadFactory;
 import org.apache.flink.util.function.RunnableWithException;
@@ -36,6 +40,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -73,8 +78,12 @@ class KubernetesHighAvailabilityTestBase {
     protected class Context {
         private final KubernetesTestFixture kubernetesTestFixture;
 
-        final LeaderElectionDriver leaderElectionDriver;
-        final TestingLeaderElectionEventHandler electionEventHandler;
+        final String contenderID;
+        final String leaderAddress;
+        final MultipleComponentLeaderElectionDriver leaderElectionDriver;
+        final TestingLeaderElectionListener electionEventHandler;
+
+        final TestingFatalErrorHandler fatalErrorHandler;
 
         final LeaderRetrievalDriver leaderRetrievalDriver;
         final TestingLeaderRetrievalEventHandler retrievalEventHandler;
@@ -85,15 +94,21 @@ class KubernetesHighAvailabilityTestBase {
         final CompletableFuture<Void> closeKubeClientFuture;
         final CompletableFuture<Map<String, String>> deleteConfigMapByLabelsFuture;
 
-        Context() {
+        Context() throws Exception {
             kubernetesTestFixture =
                     new KubernetesTestFixture(CLUSTER_ID, LEADER_CONFIGMAP_NAME, LOCK_IDENTITY);
+
+            final UUID randomTestID = UUID.randomUUID();
+            contenderID = "random-contender-id-" + randomTestID;
+            leaderAddress = "random-address-" + randomTestID;
+
             flinkKubeClient = kubernetesTestFixture.getFlinkKubeClient();
             configuration = kubernetesTestFixture.getConfiguration();
             closeKubeClientFuture = kubernetesTestFixture.getCloseKubeClientFuture();
             deleteConfigMapByLabelsFuture =
                     kubernetesTestFixture.getDeleteConfigMapByLabelsFuture();
-            electionEventHandler = new TestingLeaderElectionEventHandler(LEADER_ADDRESS);
+            electionEventHandler = new TestingLeaderElectionListener();
+            fatalErrorHandler = new TestingFatalErrorHandler();
             leaderElectionDriver = createLeaderElectionDriver();
 
             retrievalEventHandler = new TestingLeaderRetrievalEventHandler();
@@ -101,15 +116,14 @@ class KubernetesHighAvailabilityTestBase {
         }
 
         void runTest(RunnableWithException testMethod) throws Exception {
-            electionEventHandler.init(leaderElectionDriver);
-
             try {
                 testMethod.run();
             } finally {
-                electionEventHandler.close();
                 leaderElectionDriver.close();
                 leaderRetrievalDriver.close();
                 kubernetesTestFixture.close();
+
+                fatalErrorHandler.rethrowError();
             }
         }
 
@@ -125,10 +139,38 @@ class KubernetesHighAvailabilityTestBase {
             return kubernetesTestFixture.getLeaderConfigMap();
         }
 
-        // Use the leader callback to manually grant leadership
-        void leaderCallbackGrantLeadership() throws Exception {
+        String getLeaderInformationKey() {
+            return KubernetesUtils.createSingleLeaderKey(contenderID);
+        }
+
+        Optional<LeaderInformation> getLeaderInformationFromConfigMap() {
+            return KubernetesUtils.parseLeaderInformationSafely(
+                    getLeaderConfigMap().getData().get(getLeaderInformationKey()));
+        }
+
+        void putLeaderInformationIntoConfigMap(UUID leaderSessionID, String leaderAddress) {
+            getLeaderConfigMap()
+                    .getData()
+                    .put(
+                            getLeaderInformationKey(),
+                            KubernetesUtils.encodeLeaderInformation(
+                                    LeaderInformation.known(leaderSessionID, leaderAddress)));
+        }
+
+        void grantLeadership() throws Exception {
             kubernetesTestFixture.leaderCallbackGrantLeadership();
-            electionEventHandler.waitForLeader();
+        }
+
+        // Use the leader callback to manually grant leadership
+        UUID leaderCallbackGrantLeadership() throws Exception {
+            grantLeadership();
+            electionEventHandler.await(LeaderElectionEvent.IsLeaderEvent.class);
+
+            final UUID leaderSessionID = UUID.randomUUID();
+            leaderElectionDriver.publishLeaderInformation(
+                    contenderID, LeaderInformation.known(leaderSessionID, leaderAddress));
+
+            return leaderSessionID;
         }
 
         FlinkKubeClient.WatchCallbackHandler<KubernetesConfigMap>
@@ -145,26 +187,27 @@ class KubernetesHighAvailabilityTestBase {
             return kubernetesTestFixture.getLeaderCallback();
         }
 
-        private LeaderElectionDriver createLeaderElectionDriver() {
+        private MultipleComponentLeaderElectionDriver createLeaderElectionDriver()
+                throws Exception {
             final KubernetesLeaderElectionConfiguration leaderConfig =
                     new KubernetesLeaderElectionConfiguration(
                             LEADER_CONFIGMAP_NAME, LOCK_IDENTITY, configuration);
-            final KubernetesLeaderElectionDriverFactory factory =
-                    new KubernetesLeaderElectionDriverFactory(
+            final KubernetesMultipleComponentLeaderElectionDriverFactory factory =
+                    new KubernetesMultipleComponentLeaderElectionDriverFactory(
                             flinkKubeClient,
+                            leaderConfig,
                             kubernetesTestFixture.getConfigMapSharedWatcher(),
-                            watchCallbackExecutorService,
-                            leaderConfig);
-            return factory.createLeaderElectionDriver(
-                    electionEventHandler, electionEventHandler::handleError);
+                            watchCallbackExecutorService);
+            return factory.create(electionEventHandler, fatalErrorHandler);
         }
 
         private LeaderRetrievalDriver createLeaderRetrievalDriver() {
-            final KubernetesLeaderRetrievalDriverFactory factory =
-                    new KubernetesLeaderRetrievalDriverFactory(
+            final KubernetesMultipleComponentLeaderRetrievalDriverFactory factory =
+                    new KubernetesMultipleComponentLeaderRetrievalDriverFactory(
                             kubernetesTestFixture.getConfigMapSharedWatcher(),
                             watchCallbackExecutorService,
-                            LEADER_CONFIGMAP_NAME);
+                            LEADER_CONFIGMAP_NAME,
+                            contenderID);
             return factory.createLeaderRetrievalDriver(
                     retrievalEventHandler, retrievalEventHandler::handleError);
         }
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverTest.java
index af33b03779e..27e2d9d0be7 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverTest.java
@@ -21,13 +21,16 @@ package org.apache.flink.kubernetes.highavailability;
 import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesConfigMap;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesException;
+import org.apache.flink.runtime.leaderelection.LeaderElectionEvent;
 import org.apache.flink.runtime.leaderelection.LeaderElectionException;
 import org.apache.flink.runtime.leaderelection.LeaderInformation;
+import org.apache.flink.runtime.leaderelection.LeaderInformationRegister;
 
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import static org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY;
@@ -45,14 +48,10 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
             {
                 runTest(
                         () -> {
-                            // Grant leadership
-                            leaderCallbackGrantLeadership();
-                            assertThat(electionEventHandler.isLeader()).isTrue();
-                            assertThat(
-                                            electionEventHandler
-                                                    .getConfirmedLeaderInformation()
-                                                    .getLeaderAddress())
-                                    .isEqualTo(LEADER_ADDRESS);
+                            grantLeadership();
+
+                            // the following call shouldn't block
+                            electionEventHandler.await(LeaderElectionEvent.IsLeaderEvent.class);
                         });
             }
         };
@@ -68,10 +67,8 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
                             // Revoke leadership
                             getLeaderCallback().notLeader();
 
-                            electionEventHandler.waitForRevokeLeader();
-                            assertThat(electionEventHandler.isLeader()).isFalse();
-                            assertThat(electionEventHandler.getConfirmedLeaderInformation())
-                                    .isEqualTo(LeaderInformation.empty());
+                            electionEventHandler.await(LeaderElectionEvent.NotLeaderEvent.class);
+
                             // The ConfigMap should also be cleared
                             assertThat(getLeaderConfigMap().getData())
                                     .doesNotContainKey(LEADER_ADDRESS_KEY);
@@ -89,12 +86,14 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
                 runTest(
                         () -> {
                             leaderElectionDriver.hasLeadership();
-                            electionEventHandler.waitForError();
-                            final String errorMsg =
+
+                            final String expectedErrorMessage =
                                     "ConfigMap " + LEADER_CONFIGMAP_NAME + " does not exist.";
-                            assertThat(electionEventHandler.getError())
+                            assertThat(fatalErrorHandler.getException())
                                     .isInstanceOf(KubernetesException.class)
-                                    .hasMessage(errorMsg);
+                                    .hasMessageContaining(expectedErrorMessage);
+
+                            fatalErrorHandler.clearError();
                         });
             }
         };
@@ -106,18 +105,13 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
             {
                 runTest(
                         () -> {
-                            leaderCallbackGrantLeadership();
+                            final UUID leaderSessionID = leaderCallbackGrantLeadership();
 
-                            final LeaderInformation leader =
-                                    LeaderInformation.known(UUID.randomUUID(), LEADER_ADDRESS);
-                            leaderElectionDriver.writeLeaderInformation(leader);
+                            final LeaderInformation leaderInformation =
+                                    LeaderInformation.known(leaderSessionID, leaderAddress);
 
-                            assertThat(getLeaderConfigMap().getData())
-                                    .containsEntry(LEADER_ADDRESS_KEY, leader.getLeaderAddress());
-                            assertThat(getLeaderConfigMap().getData())
-                                    .containsEntry(
-                                            LEADER_SESSION_ID_KEY,
-                                            leader.getLeaderSessionID().toString());
+                            assertThat(getLeaderInformationFromConfigMap())
+                                    .hasValue(leaderInformation);
                         });
             }
         };
@@ -129,17 +123,18 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
             {
                 runTest(
                         () -> {
-                            leaderElectionDriver.writeLeaderInformation(
+                            leaderElectionDriver.publishLeaderInformation(
+                                    contenderID,
                                     LeaderInformation.known(UUID.randomUUID(), LEADER_ADDRESS));
-                            electionEventHandler.waitForError();
 
-                            final String errorMsg =
-                                    "Could not write leader information since ConfigMap "
-                                            + LEADER_CONFIGMAP_NAME
-                                            + " does not exist.";
-                            assertThat(electionEventHandler.getError())
+                            final String expectedErrorMessage =
+                                    "ConfigMap " + LEADER_CONFIGMAP_NAME + " does not exist.";
+                            assertThat(fatalErrorHandler.getException())
+                                    .cause()
                                     .isInstanceOf(KubernetesException.class)
-                                    .hasMessage(errorMsg);
+                                    .hasMessage(expectedErrorMessage);
+
+                            fatalErrorHandler.clearError();
                         });
             }
         };
@@ -151,34 +146,48 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
             {
                 runTest(
                         () -> {
-                            leaderCallbackGrantLeadership();
+                            final UUID leaderSessionID = leaderCallbackGrantLeadership();
+
+                            final Optional<LeaderInformation> leaderInformation =
+                                    getLeaderInformationFromConfigMap();
+                            assertThat(leaderInformation.map(LeaderInformation::getLeaderSessionID))
+                                    .hasValue(leaderSessionID);
+
+                            // Update ConfigMap with wrong data
+                            final UUID faultySessionID = UUID.randomUUID();
+                            final String faultyAddress = "faultyLeaderAddress";
+                            putLeaderInformationIntoConfigMap(faultySessionID, faultyAddress);
 
+                            // Simulate ConfigMap modification event
                             final FlinkKubeClient.WatchCallbackHandler<KubernetesConfigMap>
                                     callbackHandler = getLeaderElectionConfigMapCallback();
-                            // Update ConfigMap with wrong data
-                            final KubernetesConfigMap updatedConfigMap = getLeaderConfigMap();
-                            final UUID leaderSessionId =
-                                    UUID.fromString(
-                                            updatedConfigMap.getData().get(LEADER_SESSION_ID_KEY));
-                            final LeaderInformation faultyLeader =
-                                    LeaderInformation.known(
-                                            UUID.randomUUID(), "faultyLeaderAddress");
-                            updatedConfigMap
-                                    .getData()
-                                    .put(LEADER_ADDRESS_KEY, faultyLeader.getLeaderAddress());
-                            updatedConfigMap
-                                    .getData()
-                                    .put(
-                                            LEADER_SESSION_ID_KEY,
-                                            faultyLeader.getLeaderSessionID().toString());
-
-                            callbackHandler.onModified(Collections.singletonList(updatedConfigMap));
-                            // The leader should be corrected
-                            assertThat(getLeaderConfigMap().getData())
-                                    .containsEntry(LEADER_ADDRESS_KEY, LEADER_ADDRESS);
-                            assertThat(getLeaderConfigMap().getData())
-                                    .containsEntry(
-                                            LEADER_SESSION_ID_KEY, leaderSessionId.toString());
+                            callbackHandler.onModified(
+                                    Collections.singletonList(getLeaderConfigMap()));
+
+                            final LeaderInformationRegister leaderInformationRegister =
+                                    electionEventHandler
+                                            .await(
+                                                    LeaderElectionEvent
+                                                            .AllKnownLeaderInformationEvent.class)
+                                            .getLeaderInformationRegister();
+
+                            assertThat(leaderInformationRegister.getRegisteredContenderIDs())
+                                    .containsExactly(contenderID);
+
+                            final LeaderInformation expectedFaultyLeaderInformation =
+                                    LeaderInformation.known(faultySessionID, faultyAddress);
+                            assertThat(leaderInformationRegister.forContenderID(contenderID))
+                                    .hasValue(expectedFaultyLeaderInformation);
+
+                            leaderElectionDriver.publishLeaderInformation(
+                                    contenderID,
+                                    LeaderInformation.known(leaderSessionID, leaderAddress));
+
+                            assertThat(getLeaderInformationFromConfigMap())
+                                    .as("LeaderInformation should have been corrected.")
+                                    .hasValue(
+                                            LeaderInformation.known(
+                                                    leaderSessionID, leaderAddress));
                         });
             }
         };
@@ -197,12 +206,15 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
                             callbackHandler.onDeleted(
                                     Collections.singletonList(getLeaderConfigMap()));
 
-                            electionEventHandler.waitForError();
-                            final String errorMsg =
-                                    "ConfigMap " + LEADER_CONFIGMAP_NAME + " is deleted externally";
-                            assertThat(electionEventHandler.getError())
+                            final String expectedErrorMessage =
+                                    "ConfigMap "
+                                            + LEADER_CONFIGMAP_NAME
+                                            + " has been deleted externally.";
+                            assertThat(fatalErrorHandler.getException())
                                     .isInstanceOf(LeaderElectionException.class)
-                                    .hasMessage(errorMsg);
+                                    .hasMessage(expectedErrorMessage);
+
+                            fatalErrorHandler.clearError();
                         });
             }
         };
@@ -221,12 +233,15 @@ class KubernetesLeaderElectionDriverTest extends KubernetesHighAvailabilityTestB
                             callbackHandler.onError(
                                     Collections.singletonList(getLeaderConfigMap()));
 
-                            electionEventHandler.waitForError();
-                            final String errorMsg =
-                                    "Error while watching the ConfigMap " + LEADER_CONFIGMAP_NAME;
-                            assertThat(electionEventHandler.getError())
+                            final String expectedErrorMessage =
+                                    "Error while watching the ConfigMap "
+                                            + LEADER_CONFIGMAP_NAME
+                                            + ".";
+                            assertThat(fatalErrorHandler.getException())
                                     .isInstanceOf(LeaderElectionException.class)
-                                    .hasMessage(errorMsg);
+                                    .hasMessage(expectedErrorMessage);
+
+                            fatalErrorHandler.clearError();
                         });
             }
         };
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriverTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriverTest.java
index 5e09c729655..d18e71a5461 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriverTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderRetrievalDriverTest.java
@@ -20,11 +20,11 @@ package org.apache.flink.kubernetes.highavailability;
 
 import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesConfigMap;
-import org.apache.flink.kubernetes.utils.Constants;
 
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
+import java.util.UUID;
 
 import static org.apache.flink.core.testutils.FlinkAssertions.assertThatChainOfCauses;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -67,9 +67,8 @@ class KubernetesLeaderRetrievalDriverTest extends KubernetesHighAvailabilityTest
 
                             // Leader changed
                             final String newLeader = LEADER_ADDRESS + "_" + 2;
-                            getLeaderConfigMap()
-                                    .getData()
-                                    .put(Constants.LEADER_ADDRESS_KEY, newLeader);
+                            putLeaderInformationIntoConfigMap(UUID.randomUUID(), newLeader);
+
                             callbackHandler.onModified(
                                     Collections.singletonList(getLeaderConfigMap()));
 
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesStateHandleStoreTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesStateHandleStoreTest.java
index 6bf1a025da9..99119aeb9b5 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesStateHandleStoreTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesStateHandleStoreTest.java
@@ -24,6 +24,7 @@ import org.apache.flink.kubernetes.highavailability.KubernetesStateHandleStore.S
 import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesConfigMap;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesLeaderElector;
+import org.apache.flink.runtime.leaderelection.LeaderElectionEvent;
 import org.apache.flink.runtime.persistence.PossibleInconsistentStateException;
 import org.apache.flink.runtime.persistence.StateHandleStore;
 import org.apache.flink.runtime.persistence.StringResourceVersion;
@@ -511,7 +512,8 @@ class KubernetesStateHandleStoreTest extends KubernetesHighAvailabilityTestBase
                             store.addAndLock(key, state);
                             // Lost leadership
                             getLeaderCallback().notLeader();
-                            electionEventHandler.waitForRevokeLeader();
+                            electionEventHandler.await(LeaderElectionEvent.NotLeaderEvent.class);
+
                             getLeaderConfigMap()
                                     .getAnnotations()
                                     .remove(KubernetesLeaderElector.LEADER_ANNOTATION_KEY);
@@ -921,7 +923,8 @@ class KubernetesStateHandleStoreTest extends KubernetesHighAvailabilityTestBase
                             store.addAndLock(key, state);
                             // Lost leadership
                             getLeaderCallback().notLeader();
-                            electionEventHandler.waitForRevokeLeader();
+                            electionEventHandler.await(LeaderElectionEvent.NotLeaderEvent.class);
+
                             getLeaderConfigMap()
                                     .getAnnotations()
                                     .remove(KubernetesLeaderElector.LEADER_ANNOTATION_KEY);