squah-confluent commented on code in PR #21633:
URL: https://github.com/apache/kafka/pull/21633#discussion_r2891315649
##########
jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/GroupCoordinatorShardLoadingBenchmark.java:
##########
@@ -269,6 +274,11 @@ public void setup() throws Exception {
time = new MockTime();
Map<String, Object> props = new HashMap<>();
config = GroupCoordinatorConfig.fromProps(props);
+ shareGroupConfig = new ShareGroupConfig(new AbstractConfig(
+ Utils.mergeConfigs(Arrays.asList(ShareGroupConfig.CONFIG_DEF,
GroupCoordinatorConfig.CONFIG_DEF)),
+ new HashMap<>(),
+ false
+ ));
Review Comment:
Could we maybe extract this into a `ShareGroupConfig.fromProps` method?
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupConfigManagerTest.java:
##########
@@ -101,27 +129,123 @@ public void testValidateUsesAllGroupTypeDefaults() {
GroupConfigManager.validate(newGroupConfig,
groupCoordinatorConfig, shareGroupConfig));
}
+ /**
+ * Data source for {@link #testConfigClampedToMax} and {@link
#testConfigClampedToMin}.
+ * Each entry: (configKey, tooLow, expectedMin, tooHigh, expectedMax,
getter).
+ */
+ private static Stream<Arguments> clampConfigProvider() {
+ return Stream.of(
+ // Consumer group configs
+ Arguments.of(
+ CONSUMER_SESSION_TIMEOUT_MS_CONFIG,
+ 40000, CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT,
+ 70000, CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::consumerSessionTimeoutMs
+ ),
+ Arguments.of(
+ CONSUMER_HEARTBEAT_INTERVAL_MS_CONFIG,
+ 3000, CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ 20000, CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::consumerHeartbeatIntervalMs
+ ),
+ // Share group configs
+ Arguments.of(
+ SHARE_SESSION_TIMEOUT_MS_CONFIG,
+ 40000, SHARE_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT,
+ 70000, SHARE_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>) GroupConfig::shareSessionTimeoutMs
Review Comment:
Does the compiler complain if we remove the cast?
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupConfigManagerTest.java:
##########
@@ -101,27 +129,123 @@ public void testValidateUsesAllGroupTypeDefaults() {
GroupConfigManager.validate(newGroupConfig,
groupCoordinatorConfig, shareGroupConfig));
}
+ /**
+ * Data source for {@link #testConfigClampedToMax} and {@link
#testConfigClampedToMin}.
+ * Each entry: (configKey, tooLow, expectedMin, tooHigh, expectedMax,
getter).
+ */
+ private static Stream<Arguments> clampConfigProvider() {
+ return Stream.of(
+ // Consumer group configs
+ Arguments.of(
+ CONSUMER_SESSION_TIMEOUT_MS_CONFIG,
+ 40000, CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT,
+ 70000, CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::consumerSessionTimeoutMs
+ ),
+ Arguments.of(
+ CONSUMER_HEARTBEAT_INTERVAL_MS_CONFIG,
+ 3000, CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ 20000, CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::consumerHeartbeatIntervalMs
+ ),
+ // Share group configs
+ Arguments.of(
+ SHARE_SESSION_TIMEOUT_MS_CONFIG,
+ 40000, SHARE_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT,
+ 70000, SHARE_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>) GroupConfig::shareSessionTimeoutMs
+ ),
+ Arguments.of(
+ SHARE_HEARTBEAT_INTERVAL_MS_CONFIG,
+ 3000, SHARE_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ 20000, SHARE_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::shareHeartbeatIntervalMs
+ ),
+ Arguments.of(
+ SHARE_RECORD_LOCK_DURATION_MS_CONFIG,
+ 10000, SHARE_GROUP_MIN_RECORD_LOCK_DURATION_MS_DEFAULT,
+ 70000, SHARE_GROUP_MAX_RECORD_LOCK_DURATION_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::shareRecordLockDurationMs
+ ),
+ Arguments.of(
+ SHARE_DELIVERY_COUNT_LIMIT_CONFIG,
+ 1, SHARE_GROUP_MIN_DELIVERY_COUNT_LIMIT_DEFAULT,
+ 15, SHARE_GROUP_MAX_DELIVERY_COUNT_LIMIT_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::shareDeliveryCountLimit
+ ),
+ // Streams group configs
+ Arguments.of(
+ STREAMS_SESSION_TIMEOUT_MS_CONFIG,
+ 40000, STREAMS_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT,
+ 70000, STREAMS_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::streamsSessionTimeoutMs
+ ),
+ Arguments.of(
+ STREAMS_HEARTBEAT_INTERVAL_MS_CONFIG,
+ 3000, STREAMS_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ 20000, STREAMS_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::streamsHeartbeatIntervalMs
+ ),
+ Arguments.of(
+ STREAMS_NUM_STANDBY_REPLICAS_CONFIG,
+ -1, 0,
+ 5, STREAMS_GROUP_MAX_STANDBY_REPLICAS_DEFAULT,
+ (ToIntFunction<GroupConfig>)
GroupConfig::streamsNumStandbyReplicas
+ )
+ );
+ }
+
+ @ParameterizedTest(name = "testConfigClampedToMax[{0}]")
+ @MethodSource("clampConfigProvider")
+ public void testConfigClampedToMax(String key, int tooLow, int expectedMin,
+ int tooHigh, int expectedMax,
+ ToIntFunction<GroupConfig> getter) {
Review Comment:
We usually format long parameter lists like this
```
public void testConfigClampedToMax(
String key,
int tooLow,
int expectedMin,
int expectedMax,
ToIntFunction<GroupConfig> getter
) {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
