This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch 4.0
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/4.0 by this push:
new 9e80d7ed564 KAFKA-18363: Remove ZooKeeper mentiosn in broker configs
(#18346)
9e80d7ed564 is described below
commit 9e80d7ed56439356d73846f479a91c7082e0b9c2
Author: Ken Huang <[email protected]>
AuthorDate: Tue Jan 21 01:22:40 2025 +0800
KAFKA-18363: Remove ZooKeeper mentiosn in broker configs (#18346)
Reviewers: Mickael Maison <[email protected]>, TengYao Chi
<[email protected]>
---
.../java/org/apache/kafka/server/config/QuotaConfig.java | 5 ++---
.../java/org/apache/kafka/network/SocketServerConfigs.java | 4 ++--
.../java/org/apache/kafka/server/config/KRaftConfigs.java | 14 ++++++--------
.../java/org/apache/kafka/server/config/ServerConfigs.java | 4 +---
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git
a/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfig.java
b/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfig.java
index 6ecd7ffca3b..ddc9217057e 100644
---
a/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfig.java
+++
b/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfig.java
@@ -56,9 +56,8 @@ public class QuotaConfig {
public static final String CLIENT_QUOTA_CALLBACK_CLASS_CONFIG =
"client.quota.callback.class";
public static final String CLIENT_QUOTA_CALLBACK_CLASS_DOC = "The fully
qualified name of a class that implements the ClientQuotaCallback interface, " +
- "which is used to determine quota limits applied to client
requests. By default, the <user> and <client-id> " +
- "quotas that are stored in ZooKeeper are applied. For any given
request, the most specific quota that matches the user principal " +
- "of the session and the client-id of the request is applied.";
+ "which is used to determine quota limits applied to client
requests. " +
+ "For any given request, the most specific quota that matches the
user principal of the session and the client-id of the request is applied.";
public static final String LEADER_REPLICATION_THROTTLED_REPLICAS_CONFIG =
"leader.replication.throttled.replicas";
public static final String LEADER_REPLICATION_THROTTLED_REPLICAS_DOC = "A
list of replicas for which log replication should be throttled on " +
diff --git
a/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java
b/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java
index e7cb901bf19..e9c3dfff926 100644
--- a/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java
+++ b/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java
@@ -77,8 +77,8 @@ public class SocketServerConfigs {
public static final String ADVERTISED_LISTENERS_CONFIG =
"advertised.listeners";
public static final String ADVERTISED_LISTENERS_DOC =
String.format("Specifies the listener addresses that the Kafka brokers will
advertise to clients and other brokers." +
" The config is useful where the actual listener
configuration <code>%s</code> does not represent the addresses that clients
should" +
- " use to connect, such as in cloud environments. In
environments using ZooKeeper, these addresses are published to ZooKeeper." +
- " In Kraft mode, the address would be published to and
managed by kraft controller, the brokers would pull these data from controller
as needed." +
+ " use to connect, such as in cloud environments." +
+ " The addresses are published to and managed by the
controller, the brokers pull these data from the controller as needed." +
" In IaaS environments, this may need to be different from
the interface to which the broker binds." +
" If this is not set, the value for <code>%1$1s</code>
will be used." +
" Unlike <code>%1$1s</code>, it is not valid to advertise
the 0.0.0.0 meta-address.%n" +
diff --git
a/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java
b/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java
index a17cbb2131e..7a76a8d793c 100644
--- a/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java
+++ b/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java
@@ -35,20 +35,19 @@ import static
org.apache.kafka.common.config.ConfigDef.Type.STRING;
public class KRaftConfigs {
/** KRaft mode configs */
public static final String PROCESS_ROLES_CONFIG = "process.roles";
- public static final String PROCESS_ROLES_DOC = "The roles that this
process plays: 'broker', 'controller', or 'broker,controller' if it is both. " +
- "This configuration is only applicable for clusters in KRaft
(Kafka Raft) mode (instead of ZooKeeper). Leave this config undefined or empty
for ZooKeeper clusters.";
-
+ public static final String PROCESS_ROLES_DOC = "The roles that this
process plays: 'broker', 'controller', or 'broker,controller' if it is both. ";
+
public static final String INITIAL_BROKER_REGISTRATION_TIMEOUT_MS_CONFIG =
"initial.broker.registration.timeout.ms";
public static final int INITIAL_BROKER_REGISTRATION_TIMEOUT_MS_DEFAULT =
60000;
public static final String INITIAL_BROKER_REGISTRATION_TIMEOUT_MS_DOC =
"When initially registering with the controller quorum, the number of
milliseconds to wait before declaring failure and exiting the broker process.";
public static final String BROKER_HEARTBEAT_INTERVAL_MS_CONFIG =
"broker.heartbeat.interval.ms";
public static final int BROKER_HEARTBEAT_INTERVAL_MS_DEFAULT = 2000;
- public static final String BROKER_HEARTBEAT_INTERVAL_MS_DOC = "The length
of time in milliseconds between broker heartbeats. Used when running in KRaft
mode.";
+ public static final String BROKER_HEARTBEAT_INTERVAL_MS_DOC = "The length
of time in milliseconds between broker heartbeats.";
public static final String BROKER_SESSION_TIMEOUT_MS_CONFIG =
"broker.session.timeout.ms";
public static final int BROKER_SESSION_TIMEOUT_MS_DEFAULT = 9000;
- public static final String BROKER_SESSION_TIMEOUT_MS_DOC = "The length of
time in milliseconds that a broker lease lasts if no heartbeats are made. Used
when running in KRaft mode.";
+ public static final String BROKER_SESSION_TIMEOUT_MS_DOC = "The length of
time in milliseconds that a broker lease lasts if no heartbeats are made.";
public static final String NODE_ID_CONFIG = "node.id";
@@ -57,7 +56,7 @@ public class KRaftConfigs {
"This is required configuration when running in KRaft mode.";
public static final String METADATA_LOG_DIR_CONFIG = "metadata.log.dir";
- public static final String METADATA_LOG_DIR_DOC = "This configuration
determines where we put the metadata log for clusters in KRaft mode. " +
+ public static final String METADATA_LOG_DIR_DOC = "This configuration
determines where we put the metadata log. " +
"If it is not set, the metadata log is placed in the first log
directory from log.dirs.";
public static final String METADATA_SNAPSHOT_MAX_INTERVAL_MS_CONFIG =
"metadata.log.max.snapshot.interval.ms";
@@ -78,8 +77,7 @@ public class KRaftConfigs {
public static final String CONTROLLER_LISTENER_NAMES_CONFIG =
"controller.listener.names";
public static final String CONTROLLER_LISTENER_NAMES_DOC = "A
comma-separated list of the names of the listeners used by the controller. This
is required " +
- "if running in KRaft mode. When communicating with the controller
quorum, the broker will always use the first listener in this list.\n " +
- "Note: The ZooKeeper-based controller should not set this
configuration.";
+ "when communicating with the controller quorum, the broker will
always use the first listener in this list.";
public static final String SASL_MECHANISM_CONTROLLER_PROTOCOL_CONFIG =
"sasl.mechanism.controller.protocol";
public static final String SASL_MECHANISM_CONTROLLER_PROTOCOL_DOC = "SASL
mechanism used for communication with controllers. Default is GSSAPI.";
diff --git
a/server/src/main/java/org/apache/kafka/server/config/ServerConfigs.java
b/server/src/main/java/org/apache/kafka/server/config/ServerConfigs.java
index cd5da5ae9fd..e668db26e04 100644
--- a/server/src/main/java/org/apache/kafka/server/config/ServerConfigs.java
+++ b/server/src/main/java/org/apache/kafka/server/config/ServerConfigs.java
@@ -46,9 +46,7 @@ public class ServerConfigs {
public static final String BROKER_ID_CONFIG = "broker.id";
public static final int BROKER_ID_DEFAULT = -1;
- public static final String BROKER_ID_DOC = "The broker id for this server.
If unset, a unique broker id will be generated." +
- "To avoid conflicts between ZooKeeper generated broker id's and
user configured broker id's, generated broker ids " +
- "start from " + RESERVED_BROKER_MAX_ID_CONFIG + " + 1.";
+ public static final String BROKER_ID_DOC = "The broker id for this
server.";
public static final String MESSAGE_MAX_BYTES_CONFIG = "message.max.bytes";
public static final String MESSAGE_MAX_BYTES_DOC =
TopicConfig.MAX_MESSAGE_BYTES_DOC +
