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/04/13 07:57:07 UTC
[flink] branch master updated: [FLINK-31768][runtime] Removes contender description
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
The following commit(s) were added to refs/heads/master by this push:
new 36145d4e3f0 [FLINK-31768][runtime] Removes contender description
36145d4e3f0 is described below
commit 36145d4e3f035fe83a356d8c8463476c1004de65
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Wed Apr 12 09:55:21 2023 +0200
[FLINK-31768][runtime] Removes contender description
The description was only used in the deprecated ZooKeeperLeaderElectionDriver.
Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
.../KubernetesLeaderElectionDriverFactory.java | 4 +---
.../highavailability/KubernetesHighAvailabilityTestBase.java | 2 +-
.../runtime/leaderelection/DefaultLeaderElectionService.java | 4 +---
.../runtime/leaderelection/LeaderElectionDriverFactory.java | 5 +----
.../MultipleComponentLeaderElectionDriverAdapterFactory.java | 4 +---
.../runtime/leaderelection/ZooKeeperLeaderElectionDriver.java | 11 ++---------
.../leaderelection/ZooKeeperLeaderElectionDriverFactory.java | 6 ++----
.../runtime/leaderelection/TestingLeaderElectionDriver.java | 3 +--
.../runtime/leaderelection/ZooKeeperLeaderElectionTest.java | 4 +---
9 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverFactory.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverFactory.java
index 50b63378f3e..bb4dce472a3 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverFactory.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesLeaderElectionDriverFactory.java
@@ -52,9 +52,7 @@ public class KubernetesLeaderElectionDriverFactory implements LeaderElectionDriv
@Override
public KubernetesLeaderElectionDriver createLeaderElectionDriver(
- LeaderElectionEventHandler leaderEventHandler,
- FatalErrorHandler fatalErrorHandler,
- String leaderContenderDescription) {
+ LeaderElectionEventHandler leaderEventHandler, FatalErrorHandler fatalErrorHandler) {
return new KubernetesLeaderElectionDriver(
kubeClient,
configMapSharedWatcher,
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 ade0974a1b5..8367949bd09 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
@@ -156,7 +156,7 @@ class KubernetesHighAvailabilityTestBase {
watchCallbackExecutorService,
leaderConfig);
return factory.createLeaderElectionDriver(
- electionEventHandler, electionEventHandler::handleError, LEADER_ADDRESS);
+ electionEventHandler, electionEventHandler::handleError);
}
private LeaderRetrievalDriver createLeaderRetrievalDriver() {
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/DefaultLeaderElectionService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/DefaultLeaderElectionService.java
index fa9fc214724..19a56fcbd26 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/DefaultLeaderElectionService.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/DefaultLeaderElectionService.java
@@ -91,9 +91,7 @@ public class DefaultLeaderElectionService
leaderContender = contender;
leaderElectionDriver =
leaderElectionDriverFactory.createLeaderElectionDriver(
- this,
- new LeaderElectionFatalErrorHandler(),
- leaderContender.getDescription());
+ this, new LeaderElectionFatalErrorHandler());
LOG.info("Starting DefaultLeaderElectionService with {}.", leaderElectionDriver);
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/LeaderElectionDriverFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/LeaderElectionDriverFactory.java
index 86d0d1141be..07ba9acec93 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/LeaderElectionDriverFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/LeaderElectionDriverFactory.java
@@ -29,14 +29,11 @@ public interface LeaderElectionDriverFactory {
* Kubernetes.
*
* @param leaderEventHandler handler for the leader election driver to process leader events.
- * @param leaderContenderDescription leader contender description.
* @param fatalErrorHandler fatal error handler
* @throws Exception when create a specific {@link LeaderElectionDriver} implementation and
* start the necessary services.
*/
LeaderElectionDriver createLeaderElectionDriver(
- LeaderElectionEventHandler leaderEventHandler,
- FatalErrorHandler fatalErrorHandler,
- String leaderContenderDescription)
+ LeaderElectionEventHandler leaderEventHandler, FatalErrorHandler fatalErrorHandler)
throws Exception;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/MultipleComponentLeaderElectionDriverAdapterFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/MultipleComponentLeaderElectionDriverAdapterFactory.java
index 939cfb0c608..bf62709502d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/MultipleComponentLeaderElectionDriverAdapterFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/MultipleComponentLeaderElectionDriverAdapterFactory.java
@@ -35,9 +35,7 @@ final class MultipleComponentLeaderElectionDriverAdapterFactory
@Override
public LeaderElectionDriver createLeaderElectionDriver(
- LeaderElectionEventHandler leaderEventHandler,
- FatalErrorHandler fatalErrorHandler,
- String leaderContenderDescription)
+ LeaderElectionEventHandler leaderEventHandler, FatalErrorHandler fatalErrorHandler)
throws Exception {
return new MultipleComponentLeaderElectionDriverAdapter(
leaderName, singleLeaderElectionService, leaderEventHandler);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
index 75ae702daa0..cbcf02fdfa4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
@@ -72,8 +72,6 @@ public class ZooKeeperLeaderElectionDriver implements LeaderElectionDriver, Lead
private final FatalErrorHandler fatalErrorHandler;
- private final String leaderContenderDescription;
-
private volatile boolean running;
/**
@@ -83,21 +81,18 @@ public class ZooKeeperLeaderElectionDriver implements LeaderElectionDriver, Lead
* @param path ZooKeeper node path for the leader election
* @param leaderElectionEventHandler Event handler for processing leader change events
* @param fatalErrorHandler Fatal error handler
- * @param leaderContenderDescription Leader contender description
*/
public ZooKeeperLeaderElectionDriver(
CuratorFramework client,
String path,
LeaderElectionEventHandler leaderElectionEventHandler,
- FatalErrorHandler fatalErrorHandler,
- String leaderContenderDescription)
+ FatalErrorHandler fatalErrorHandler)
throws Exception {
checkNotNull(path);
this.client = checkNotNull(client);
this.connectionInformationPath = ZooKeeperUtils.generateConnectionInformationPath(path);
this.leaderElectionEventHandler = checkNotNull(leaderElectionEventHandler);
this.fatalErrorHandler = checkNotNull(fatalErrorHandler);
- this.leaderContenderDescription = checkNotNull(leaderContenderDescription);
leaderLatchPath = ZooKeeperUtils.generateLeaderLatchPath(path);
leaderLatch = new LeaderLatch(client, leaderLatchPath);
@@ -225,9 +220,7 @@ public class ZooKeeperLeaderElectionDriver implements LeaderElectionDriver, Lead
case LOST:
// Maybe we have to throw an exception here to terminate the JobManager
LOG.warn(
- "Connection to ZooKeeper lost. The contender "
- + leaderContenderDescription
- + " no longer participates in the leader election.");
+ "Connection to ZooKeeper lost. The contender no longer participates in the leader election.");
break;
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
index 72175a34c11..eecbe25c01c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
@@ -40,11 +40,9 @@ public class ZooKeeperLeaderElectionDriverFactory implements LeaderElectionDrive
@Override
public ZooKeeperLeaderElectionDriver createLeaderElectionDriver(
- LeaderElectionEventHandler leaderEventHandler,
- FatalErrorHandler fatalErrorHandler,
- String leaderContenderDescription)
+ LeaderElectionEventHandler leaderEventHandler, FatalErrorHandler fatalErrorHandler)
throws Exception {
return new ZooKeeperLeaderElectionDriver(
- client, path, leaderEventHandler, fatalErrorHandler, leaderContenderDescription);
+ client, path, leaderEventHandler, fatalErrorHandler);
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingLeaderElectionDriver.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingLeaderElectionDriver.java
index d05e6b4a1d9..5352e498641 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingLeaderElectionDriver.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingLeaderElectionDriver.java
@@ -100,8 +100,7 @@ public class TestingLeaderElectionDriver implements LeaderElectionDriver {
@Override
public LeaderElectionDriver createLeaderElectionDriver(
LeaderElectionEventHandler leaderEventHandler,
- FatalErrorHandler fatalErrorHandler,
- String leaderContenderDescription) {
+ FatalErrorHandler fatalErrorHandler) {
currentLeaderDriver =
new TestingLeaderElectionDriver(leaderEventHandler, fatalErrorHandler);
return currentLeaderDriver;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
index 2141839e7a3..53fc1a1feab 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
@@ -775,9 +775,7 @@ class ZooKeeperLeaderElectionTest {
final ZooKeeperLeaderElectionDriver leaderElectionDriver =
ZooKeeperUtils.createLeaderElectionDriverFactory(client)
.createLeaderElectionDriver(
- electionEventHandler,
- electionEventHandler::handleError,
- LEADER_ADDRESS);
+ electionEventHandler, electionEventHandler::handleError);
electionEventHandler.init(leaderElectionDriver);
return leaderElectionDriver;
}