vvcephei commented on a change in pull request #8716:
URL: https://github.com/apache/kafka/pull/8716#discussion_r430668785
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
+ consumerProps.put(MAX_WARMUP_REPLICAS_CONFIG,
getInt(MAX_WARMUP_REPLICAS_CONFIG));
+ consumerProps.put(PROBING_REBALANCE_INTERVAL_MS_CONFIG,
getLong(PROBING_REBALANCE_INTERVAL_MS_CONFIG));
Review comment:
Yes, we copy over the other internal configs in
org.apache.kafka.streams.processor.internals.StreamThread#create
I'll add your listener to the config test. I'm not sure about
PartitionGrouper.
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java
##########
@@ -359,6 +359,10 @@ private AssignmentConfigs(final StreamsConfig configs) {
final Integer maxWarmupReplicas,
final Integer numStandbyReplicas,
final Long probingRebalanceIntervalMs) {
+ if (maxWarmupReplicas < 1) {
+ throw new IllegalArgumentException("must configure at least
one warmup replica");
+ }
+
Review comment:
We could; to be fair, the config parser already checks the limits, so
it's not necessary for production code.
It only comes up when we manually create these internal objects for tests. I
added this particular bound specifically because I had previously passed in
what I thought was a dummy value, which turned out to be a misconfiguration
that actually affected the behavior I was testing.
Offhand, it doesn't seem like the same thing would happen with
probingRebalanceIntervalMs, so it doesn't seem like the check here would have
the same benefit; WDYT?
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/HighAvailabilityTaskAssignor.java
##########
@@ -241,16 +239,29 @@ private static void assignStatelessActiveTasks(final
TreeMap<UUID, ClientState>
final Map<TaskId, SortedSet<UUID>> taskToCaughtUpClients = new
HashMap<>();
for (final TaskId task : statefulTasks) {
-
+ final TreeSet<UUID> caughtUpClients = new TreeSet<>();
Review comment:
Cool; thanks!
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
Review comment:
Ack, I'll take a look at it,.
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
Review comment:
Ack, I'll take a look at it.
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
+ consumerProps.put(MAX_WARMUP_REPLICAS_CONFIG,
getInt(MAX_WARMUP_REPLICAS_CONFIG));
+ consumerProps.put(PROBING_REBALANCE_INTERVAL_MS_CONFIG,
getLong(PROBING_REBALANCE_INTERVAL_MS_CONFIG));
Review comment:
The answer about your listener is that we automatically pass through any
config that _isn't_ registered. The assumption is, I suppose, that users might
want to pass through custom configs to their custom plugged-in components.
The configs in this PR got filtered out because they are registered configs
in the public API.
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
+ consumerProps.put(MAX_WARMUP_REPLICAS_CONFIG,
getInt(MAX_WARMUP_REPLICAS_CONFIG));
+ consumerProps.put(PROBING_REBALANCE_INTERVAL_MS_CONFIG,
getLong(PROBING_REBALANCE_INTERVAL_MS_CONFIG));
Review comment:
Turns out PartitionGrouper does _not_ get copied over. I'll create a
jira to track this, so that we don't have to get sidetracked in this PR with
the question of what we should do about this deprecated config.
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
+ consumerProps.put(MAX_WARMUP_REPLICAS_CONFIG,
getInt(MAX_WARMUP_REPLICAS_CONFIG));
+ consumerProps.put(PROBING_REBALANCE_INTERVAL_MS_CONFIG,
getLong(PROBING_REBALANCE_INTERVAL_MS_CONFIG));
Review comment:
https://issues.apache.org/jira/browse/KAFKA-10046
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java
##########
@@ -359,6 +359,10 @@ private AssignmentConfigs(final StreamsConfig configs) {
final Integer maxWarmupReplicas,
final Integer numStandbyReplicas,
final Long probingRebalanceIntervalMs) {
+ if (maxWarmupReplicas < 1) {
+ throw new IllegalArgumentException("must configure at least
one warmup replica");
+ }
+
Review comment:
Nevermind; I refactored the class to use the same config validation for
passed-in arguments.
##########
File path:
streams/src/test/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfigurationTest.java
##########
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.streams.processor.internals.assignment;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThrows;
+
+public class AssignorConfigurationTest {
Review comment:
Ah, unfortunately, that test relies on mocking package-private fields
from another package. I'll just leave it alone for now.
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
Review comment:
It does wind up "surviving" into the config that we use in the assignor,
but I'm not sure if it's on purpose or just lucky.
I'll postpone any existential questions, and just add it to the regression
test.
##########
File path: streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
##########
@@ -1148,6 +1148,9 @@ private void verifyMaxInFlightRequestPerConnection(final
Object maxInFlightReque
consumerProps.put(REPLICATION_FACTOR_CONFIG,
getInt(REPLICATION_FACTOR_CONFIG));
consumerProps.put(APPLICATION_SERVER_CONFIG,
getString(APPLICATION_SERVER_CONFIG));
consumerProps.put(NUM_STANDBY_REPLICAS_CONFIG,
getInt(NUM_STANDBY_REPLICAS_CONFIG));
+ consumerProps.put(ACCEPTABLE_RECOVERY_LAG_CONFIG,
getLong(ACCEPTABLE_RECOVERY_LAG_CONFIG));
Review comment:
Ah, it was also tested here:
org.apache.kafka.streams.StreamsConfigTest#consumerConfigShouldContainAdminClientConfigsForRetriesAndRetryBackOffMsWithAdminPrefix
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java
##########
@@ -347,22 +348,28 @@ public AssignmentListener assignmentListener() {
public final long probingRebalanceIntervalMs;
Review comment:
Ah, right. Sure thing!
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
