ableegoldman commented on a change in pull request #8716:
URL: https://github.com/apache/kafka/pull/8716#discussion_r429491985
##########
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:
Do we automatically pass through the internal configs? I notice we don't
copy over the task assignor class, or the new assignment listener callback I
added for the integration tests. But both of them seem to get through
##########
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:
Should we move the handful of AssignorConfiguration related tests from
StreamsPartitionAssignorTest to here?
##########
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:
Fair enough. I don't think it was meant as a cost saving thing, just to
make it easier to understand when something did or did not have caught-up
clients. If you find this logic easier to follow, go for it
##########
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<>();
for (final Map.Entry<UUID, ClientState> clientEntry :
clientStates.entrySet()) {
final UUID client = clientEntry.getKey();
final long taskLag = clientEntry.getValue().lagFor(task);
- if (taskLag == Task.LATEST_OFFSET || taskLag <=
acceptableRecoveryLag) {
- taskToCaughtUpClients.computeIfAbsent(task, ignored -> new
TreeSet<>()).add(client);
+ if (active(taskLag) || unbounded(acceptableRecoveryLag) ||
acceptable(acceptableRecoveryLag, taskLag)) {
Review comment:
Nice catch! One nit is that "active" alone is not sufficient for being
considered caught-up. Can we rename the `active` condition to `running` or
`activeRunning`, etc?
##########
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:
I know it's deprecated, but I think the PartitionGrouper config is
missing as well.
----------------------------------------------------------------
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
