vvcephei commented on a change in pull request #8588:
URL: https://github.com/apache/kafka/pull/8588#discussion_r424821641
##########
File path:
streams/src/test/java/org/apache/kafka/streams/processor/internals/assignment/TaskMovementTest.java
##########
@@ -35,262 +44,161 @@
import static
org.apache.kafka.streams.processor.internals.assignment.AssignmentTestUtils.UUID_2;
import static
org.apache.kafka.streams.processor.internals.assignment.AssignmentTestUtils.UUID_3;
import static
org.apache.kafka.streams.processor.internals.assignment.AssignmentTestUtils.getClientStatesMap;
+import static
org.apache.kafka.streams.processor.internals.assignment.AssignmentTestUtils.hasProperty;
import static
org.apache.kafka.streams.processor.internals.assignment.TaskMovement.assignTaskMovements;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import org.apache.kafka.streams.processor.TaskId;
-import org.junit.Test;
+import static org.hamcrest.Matchers.is;
public class TaskMovementTest {
- private final ClientState client1 = new ClientState(1);
- private final ClientState client2 = new ClientState(1);
- private final ClientState client3 = new ClientState(1);
-
- private final Map<UUID, ClientState> clientStates =
getClientStatesMap(client1, client2, client3);
-
- private final Map<UUID, List<TaskId>> emptyWarmupAssignment = mkMap(
- mkEntry(UUID_1, EMPTY_TASK_LIST),
- mkEntry(UUID_2, EMPTY_TASK_LIST),
- mkEntry(UUID_3, EMPTY_TASK_LIST)
- );
-
@Test
public void
shouldAssignTasksToClientsAndReturnFalseWhenAllClientsCaughtUp() {
final int maxWarmupReplicas = Integer.MAX_VALUE;
final Set<TaskId> allTasks = mkSet(TASK_0_0, TASK_0_1, TASK_0_2,
TASK_1_0, TASK_1_1, TASK_1_2);
- final Map<UUID, List<TaskId>> balancedAssignment = mkMap(
- mkEntry(UUID_1, asList(TASK_0_0, TASK_1_0)),
- mkEntry(UUID_2, asList(TASK_0_1, TASK_1_1)),
- mkEntry(UUID_3, asList(TASK_0_2, TASK_1_2))
- );
-
final Map<TaskId, SortedSet<UUID>> tasksToCaughtUpClients = new
HashMap<>();
for (final TaskId task : allTasks) {
tasksToCaughtUpClients.put(task, mkSortedSet(UUID_1, UUID_2,
UUID_3));
}
-
- assertFalse(
+
+ final ClientState client1 =
getClientStateWithActiveAssignment(asList(TASK_0_0, TASK_1_0));
+ final ClientState client2 =
getClientStateWithActiveAssignment(asList(TASK_0_1, TASK_1_1));
+ final ClientState client3 =
getClientStateWithActiveAssignment(asList(TASK_0_2, TASK_1_2));
+
+ assertThat(
assignTaskMovements(
- balancedAssignment,
tasksToCaughtUpClients,
- clientStates,
- getMapWithNumStandbys(allTasks, 1),
- maxWarmupReplicas)
+ getClientStatesMap(client1, client2, client3),
+ maxWarmupReplicas),
+ is(false)
);
-
- verifyClientStateAssignments(balancedAssignment,
emptyWarmupAssignment);
}
@Test
public void
shouldAssignAllTasksToClientsAndReturnFalseIfNoClientsAreCaughtUp() {
- final int maxWarmupReplicas = 2;
- final Set<TaskId> allTasks = mkSet(TASK_0_0, TASK_0_1, TASK_0_2,
TASK_1_0, TASK_1_1, TASK_1_2);
+ final int maxWarmupReplicas = Integer.MAX_VALUE;
- final Map<UUID, List<TaskId>> balancedAssignment = mkMap(
- mkEntry(UUID_1, asList(TASK_0_0, TASK_1_0)),
- mkEntry(UUID_2, asList(TASK_0_1, TASK_1_1)),
- mkEntry(UUID_3, asList(TASK_0_2, TASK_1_2))
- );
+ final ClientState client1 =
getClientStateWithActiveAssignment(asList(TASK_0_0, TASK_1_0));
+ final ClientState client2 =
getClientStateWithActiveAssignment(asList(TASK_0_1, TASK_1_1));
+ final ClientState client3 =
getClientStateWithActiveAssignment(asList(TASK_0_2, TASK_1_2));
- assertFalse(
+ assertThat(
assignTaskMovements(
- balancedAssignment,
emptyMap(),
- clientStates,
- getMapWithNumStandbys(allTasks, 1),
- maxWarmupReplicas)
+ getClientStatesMap(client1, client2, client3),
+ maxWarmupReplicas),
+ is(false)
);
- verifyClientStateAssignments(balancedAssignment,
emptyWarmupAssignment);
}
@Test
public void
shouldMoveTasksToCaughtUpClientsAndAssignWarmupReplicasInTheirPlace() {
final int maxWarmupReplicas = Integer.MAX_VALUE;
- final Set<TaskId> allTasks = mkSet(TASK_0_0, TASK_0_1, TASK_0_2);
+ final ClientState client1 =
getClientStateWithActiveAssignment(singletonList(TASK_0_0));
+ final ClientState client2 =
getClientStateWithActiveAssignment(singletonList(TASK_0_1));
+ final ClientState client3 =
getClientStateWithActiveAssignment(singletonList(TASK_0_2));
+ final Map<UUID, ClientState> clientStates =
getClientStatesMap(client1, client2, client3);
- final Map<UUID, List<TaskId>> balancedAssignment = mkMap(
- mkEntry(UUID_1, singletonList(TASK_0_0)),
- mkEntry(UUID_2, singletonList(TASK_0_1)),
- mkEntry(UUID_3, singletonList(TASK_0_2))
+ final Map<TaskId, SortedSet<UUID>> tasksToCaughtUpClients = mkMap(
+ mkEntry(TASK_0_0, mkSortedSet(UUID_1)),
+ mkEntry(TASK_0_1, mkSortedSet(UUID_3)),
+ mkEntry(TASK_0_2, mkSortedSet(UUID_2))
);
- final Map<TaskId, SortedSet<UUID>> tasksToCaughtUpClients = new
HashMap<>();
- tasksToCaughtUpClients.put(TASK_0_0, mkSortedSet(UUID_1));
- tasksToCaughtUpClients.put(TASK_0_1, mkSortedSet(UUID_3));
- tasksToCaughtUpClients.put(TASK_0_2, mkSortedSet(UUID_2));
-
- final Map<UUID, List<TaskId>> expectedActiveTaskAssignment = mkMap(
- mkEntry(UUID_1, singletonList(TASK_0_0)),
- mkEntry(UUID_2, singletonList(TASK_0_2)),
- mkEntry(UUID_3, singletonList(TASK_0_1))
- );
-
- final Map<UUID, List<TaskId>> expectedWarmupTaskAssignment = mkMap(
- mkEntry(UUID_1, EMPTY_TASK_LIST),
- mkEntry(UUID_2, singletonList(TASK_0_1)),
- mkEntry(UUID_3, singletonList(TASK_0_2))
- );
-
- assertTrue(
+ assertThat(
+ "should have assigned movements",
assignTaskMovements(
- balancedAssignment,
tasksToCaughtUpClients,
clientStates,
- getMapWithNumStandbys(allTasks, 1),
- maxWarmupReplicas)
- );
- verifyClientStateAssignments(expectedActiveTaskAssignment,
expectedWarmupTaskAssignment);
- }
-
- @Test
- public void shouldProduceBalancedAndStateConstrainedAssignment() {
Review comment:
Ah, thanks. I guess I'll just leave it out, then.
----------------------------------------------------------------
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
