You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by de...@apache.org on 2023/05/12 06:03:27 UTC
[kafka] branch trunk updated: MINOR:code optimization in QuorumController (#13697)
This is an automated email from the ASF dual-hosted git repository.
dengziming pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 440bed23913 MINOR:code optimization in QuorumController (#13697)
440bed23913 is described below
commit 440bed2391338dc10fe4d36ab17dc104b61b85e8
Author: hudeqi <12...@qq.com>
AuthorDate: Fri May 12 14:03:17 2023 +0800
MINOR:code optimization in QuorumController (#13697)
1. add hint in switch item "BROKER_LOGGER" in ConfigResourceExistenceChecker, otherwise, it will be classified as default break and deleted directly. I don’t know if adding hint is better than deleting directly.
2. delete some unused variables and methods.
3. add the "@test" mark to a method in unit test that is forgotten.
Reviewers: dengziming <de...@gmail.com>
---
.../org/apache/kafka/controller/QuorumController.java | 16 +---------------
.../apache/kafka/controller/QuorumControllerTest.java | 1 +
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
index 96b4b9ef584..4da4298a146 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
+++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
@@ -378,6 +378,7 @@ public final class QuorumController implements Controller {
public void accept(ConfigResource configResource) {
switch (configResource.type()) {
case BROKER_LOGGER:
+ // BROKER_LOGGER are always allowed.
break;
case BROKER:
// Cluster configs are always allowed.
@@ -433,15 +434,6 @@ public final class QuorumController implements Controller {
}
}
- public static int exceptionToApparentController(NotControllerException e) {
- if (e.getMessage().startsWith(ACTIVE_CONTROLLER_EXCEPTION_TEXT_PREFIX)) {
- return Integer.parseInt(e.getMessage().substring(
- ACTIVE_CONTROLLER_EXCEPTION_TEXT_PREFIX.length()));
- } else {
- return -1;
- }
- }
-
private void handleEventEnd(String name, long startProcessingTimeNs) {
long endProcessingTime = time.nanoseconds();
long deltaNs = endProcessingTime - startProcessingTimeNs;
@@ -1586,11 +1578,6 @@ public final class QuorumController implements Controller {
*/
private final FaultHandler fatalFaultHandler;
- /**
- * The slf4j log context, used to create new loggers.
- */
- private final LogContext logContext;
-
/**
* The slf4j logger.
*/
@@ -1823,7 +1810,6 @@ public final class QuorumController implements Controller {
boolean zkMigrationEnabled
) {
this.fatalFaultHandler = fatalFaultHandler;
- this.logContext = logContext;
this.log = logContext.logger(QuorumController.class);
this.nodeId = nodeId;
this.clusterId = clusterId;
diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
index afb83ffb27a..2604b59a20d 100644
--- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
+++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
@@ -350,6 +350,7 @@ public class QuorumControllerTest {
}
}
+ @Test
public void testBalancePartitionLeaders() throws Throwable {
List<Integer> allBrokers = Arrays.asList(1, 2, 3);
List<Integer> brokersToKeepUnfenced = Arrays.asList(1, 2);