You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ch...@apache.org on 2024/10/29 15:29:25 UTC
(kafka) branch trunk updated: KAFKA-17128 Make node.id immutable after removing zookeeper migration (#17616)
This is an automated email from the ASF dual-hosted git repository.
chia7712 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 7366f0487aa KAFKA-17128 Make node.id immutable after removing zookeeper migration (#17616)
7366f0487aa is described below
commit 7366f0487aa2500e65d4392e6dfa4fa6fce5e9ec
Author: TengYao Chi <ki...@gmail.com>
AuthorDate: Tue Oct 29 23:29:18 2024 +0800
KAFKA-17128 Make node.id immutable after removing zookeeper migration (#17616)
Reviewers: Chia-Ping Tsai <ch...@gmail.com>
---
core/src/main/scala/kafka/server/KafkaConfig.scala | 6 ++----
core/src/main/scala/kafka/server/KafkaServer.scala | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index 29d9156a2fc..fec938758c4 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -328,10 +328,8 @@ class KafkaConfig private(doLog: Boolean, val props: util.Map[_, _])
/** ********* General Configuration ***********/
val brokerIdGenerationEnable: Boolean = getBoolean(ServerConfigs.BROKER_ID_GENERATION_ENABLE_CONFIG)
val maxReservedBrokerId: Int = getInt(ServerConfigs.RESERVED_BROKER_MAX_ID_CONFIG)
- private[server] var _brokerId: Int = getInt(ServerConfigs.BROKER_ID_CONFIG)
- def brokerId: Int = _brokerId
- private[server] var _nodeId: Int = getInt(KRaftConfigs.NODE_ID_CONFIG)
- def nodeId: Int = _nodeId
+ var brokerId: Int = getInt(ServerConfigs.BROKER_ID_CONFIG)
+ val nodeId: Int = getInt(KRaftConfigs.NODE_ID_CONFIG)
val initialRegistrationTimeoutMs: Int = getInt(KRaftConfigs.INITIAL_BROKER_REGISTRATION_TIMEOUT_MS_CONFIG)
val brokerHeartbeatIntervalMs: Int = getInt(KRaftConfigs.BROKER_HEARTBEAT_INTERVAL_MS_CONFIG)
val brokerSessionTimeoutMs: Int = getInt(KRaftConfigs.BROKER_SESSION_TIMEOUT_MS_CONFIG)
diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala
index f545eae4d7c..0d137e51584 100755
--- a/core/src/main/scala/kafka/server/KafkaServer.scala
+++ b/core/src/main/scala/kafka/server/KafkaServer.scala
@@ -259,8 +259,7 @@ class KafkaServer(
initialMetaPropsEnsemble.verify(Optional.of(_clusterId), verificationId, verificationFlags)
/* generate brokerId */
- config._brokerId = getOrGenerateBrokerId(initialMetaPropsEnsemble)
- config._nodeId = config.brokerId
+ config.brokerId = getOrGenerateBrokerId(initialMetaPropsEnsemble)
logContext = new LogContext(s"[KafkaServer id=${config.brokerId}] ")
this.logIdent = logContext.logPrefix