This is an automated email from the ASF dual-hosted git repository.
dajac 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 a4cd94e4ef9 MINOR: Fix the leak "unknown"
`group.coordinator.rebalance.protocols` on documentation (#17834)
a4cd94e4ef9 is described below
commit a4cd94e4ef97a06a3a437c3d657edbbd43a7b97b
Author: Ken Huang <[email protected]>
AuthorDate: Tue Nov 19 23:52:31 2024 +0800
MINOR: Fix the leak "unknown" `group.coordinator.rebalance.protocols` on
documentation (#17834)
Reviewers: Chia-Ping Tsai <[email protected]>, David Jacot
<[email protected]>
---
.../src/main/java/org/apache/kafka/coordinator/group/Group.java | 7 +++++++
.../org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java | 7 ++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java
index ab69970140e..b5d63499751 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java
@@ -67,6 +67,13 @@ public interface Group {
return type == null ? UNKNOWN : type;
}
+
+ static String[] documentValidValues() {
+ return Arrays.stream(GroupType.values())
+ .filter(type -> type != UNKNOWN)
+ .map(GroupType::toString)
+ .toArray(String[]::new);
+ }
}
/**
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java
index b1e41720fe3..5e7e18efa1f 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java
@@ -25,13 +25,11 @@ import
org.apache.kafka.coordinator.group.assignor.RangeAssignor;
import org.apache.kafka.coordinator.group.assignor.UniformAssignor;
import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.stream.Collectors;
import static org.apache.kafka.common.config.ConfigDef.Importance.HIGH;
import static org.apache.kafka.common.config.ConfigDef.Importance.MEDIUM;
@@ -75,8 +73,7 @@ public class GroupCoordinatorConfig {
public static final boolean NEW_GROUP_COORDINATOR_ENABLE_DEFAULT = true;
public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG =
"group.coordinator.rebalance.protocols";
- public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC =
"The list of enabled rebalance protocols. Supported protocols: " +
-
Arrays.stream(Group.GroupType.values()).map(Group.GroupType::toString).collect(Collectors.joining(","))
+ ". " +
+ public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC =
"The list of enabled rebalance protocols." +
"The " + Group.GroupType.SHARE + " rebalance protocol is in early
access and therefore must not be used in production.";
public static final List<String>
GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT = List.of(
Group.GroupType.CLASSIC.toString(),
@@ -215,7 +212,7 @@ public class GroupCoordinatorConfig {
public static final ConfigDef NEW_GROUP_CONFIG_DEF = new ConfigDef()
.define(GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, LIST,
GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT,
-
ConfigDef.ValidList.in(Utils.enumOptions(Group.GroupType.class)), MEDIUM,
GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC)
+
ConfigDef.ValidList.in(Group.GroupType.documentValidValues()), MEDIUM,
GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC)
.define(GROUP_COORDINATOR_NUM_THREADS_CONFIG, INT,
GROUP_COORDINATOR_NUM_THREADS_DEFAULT, atLeast(1), MEDIUM,
GROUP_COORDINATOR_NUM_THREADS_DOC)
.define(GROUP_COORDINATOR_APPEND_LINGER_MS_CONFIG, INT,
GROUP_COORDINATOR_APPEND_LINGER_MS_DEFAULT, atLeast(0), MEDIUM,
GROUP_COORDINATOR_APPEND_LINGER_MS_DOC)
// Internal configuration used by integration and system tests.
