Skip to content

Commit 781bc7a

Browse files
MINOR: Cleanup 'share' from group.coordinator.rebalance.protocols (#20466)
Cleanup 'share' from group.coordinator.rebalance.protocols as a valid value. Share Groups should instead be enabled through the share.version Reviewers: Andrew Schofield <[email protected]>, jimmy <[email protected]>, TaiJuWu <[email protected]>, Chia-Ping Tsai <[email protected]>
1 parent d35324e commit 781bc7a

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

core/src/main/scala/kafka/server/KafkaConfig.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,10 @@ class KafkaConfig private(doLog: Boolean, val props: util.Map[_, _])
367367
if (!protocols.contains(GroupType.CLASSIC)) {
368368
throw new ConfigException(s"Disabling the '${GroupType.CLASSIC}' protocol is not supported.")
369369
}
370+
if (protocols.contains(GroupType.SHARE)) {
371+
warn(s"'${GroupType.SHARE}' in ${GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG} is deprecated. " +
372+
s"Share groups are controlled by the 'share.version' feature; this broker config will be ignored in a future release.")
373+
}
370374
protocols
371375
}
372376

core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,6 +1782,10 @@ class KafkaConfigTest {
17821782
// Setting KRaft's properties.
17831783
props.putAll(kraftProps())
17841784

1785+
// Empty list is illegal.
1786+
props.put(GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, "")
1787+
assertThrows(classOf[ConfigException], () => KafkaConfig.fromProps(props))
1788+
17851789
// Only classic, consumer and share are supported.
17861790
props.put(GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, "foo")
17871791
assertThrows(classOf[ConfigException], () => KafkaConfig.fromProps(props))
@@ -1792,17 +1796,17 @@ class KafkaConfigTest {
17921796

17931797
// This is OK.
17941798
props.put(GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, "classic,consumer")
1795-
var config = KafkaConfig.fromProps(props)
1799+
val config = KafkaConfig.fromProps(props)
17961800
assertEquals(Set(GroupType.CLASSIC, GroupType.CONSUMER), config.groupCoordinatorRebalanceProtocols)
17971801

1798-
// This is OK.
1799-
props.put(GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, "classic,consumer,share")
1800-
config = KafkaConfig.fromProps(props)
1801-
assertEquals(Set(GroupType.CLASSIC, GroupType.CONSUMER, GroupType.SHARE), config.groupCoordinatorRebalanceProtocols)
1802-
18031802
props.put(GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, "classic,streams")
18041803
val config2 = KafkaConfig.fromProps(props)
18051804
assertEquals(Set(GroupType.CLASSIC, GroupType.STREAMS), config2.groupCoordinatorRebalanceProtocols)
1805+
1806+
// Including "share" is also OK
1807+
props.put(GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, "classic,consumer,share")
1808+
val config3 = KafkaConfig.fromProps(props)
1809+
assertEquals(Set(GroupType.CLASSIC, GroupType.CONSUMER, GroupType.SHARE), config3.groupCoordinatorRebalanceProtocols)
18061810
}
18071811

18081812
@Test

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ public class GroupCoordinatorConfig {
297297

298298
public static final ConfigDef CONFIG_DEF = new ConfigDef()
299299
// Group coordinator configs
300-
.define(GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, LIST, GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT,
301-
ConfigDef.ValidList.in(false, Group.GroupType.documentValidValues()), MEDIUM, GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC)
300+
.define(GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, LIST, GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT,
301+
ConfigDef.ValidList.in(false, Group.GroupType.documentValidValues()), MEDIUM, GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC)
302302
.define(GROUP_COORDINATOR_NUM_THREADS_CONFIG, INT, GROUP_COORDINATOR_NUM_THREADS_DEFAULT, atLeast(1), HIGH, GROUP_COORDINATOR_NUM_THREADS_DOC)
303303
.define(GROUP_COORDINATOR_APPEND_LINGER_MS_CONFIG, INT, GROUP_COORDINATOR_APPEND_LINGER_MS_DEFAULT, atLeast(0), MEDIUM, GROUP_COORDINATOR_APPEND_LINGER_MS_DOC)
304304
.define(OFFSET_COMMIT_TIMEOUT_MS_CONFIG, INT, OFFSET_COMMIT_TIMEOUT_MS_DEFAULT, atLeast(1), HIGH, OFFSET_COMMIT_TIMEOUT_MS_DOC)

0 commit comments

Comments
 (0)