shashankhs11 commented on code in PR #20818:
URL: https://github.com/apache/kafka/pull/20818#discussion_r2499104740
##########
streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskManagerTest.java:
##########
@@ -2872,88 +2874,88 @@ public void shouldAddNewActiveTasks() {
@Test
public void shouldNotCompleteRestorationIfTasksCannotInitialize() {
+ final StreamTask task00 = statefulTask(taskId00,
taskId00ChangelogPartitions)
+ .withInputPartitions(taskId00Partitions)
+ .inState(State.CREATED)
+ .build();
+
+ final TasksRegistry tasks = mock(TasksRegistry.class);
+ final TaskManager taskManager =
setUpTaskManagerWithStateUpdater(ProcessingMode.AT_LEAST_ONCE, tasks);
final Map<TaskId, Set<TopicPartition>> assignment = mkMap(
- mkEntry(taskId00, taskId00Partitions),
- mkEntry(taskId01, taskId01Partitions)
+ mkEntry(taskId00, taskId00Partitions)
);
- final Task task00 = new StateMachineTask(taskId00, taskId00Partitions,
true, stateManager) {
- @Override
- public void initializeIfNeeded() {
- throw new LockException("can't lock");
- }
- };
- final Task task01 = new StateMachineTask(taskId01, taskId01Partitions,
true, stateManager) {
- @Override
- public void initializeIfNeeded() {
- throw new TimeoutException("timed out");
- }
- };
-
- when(activeTaskCreator.createTasks(any(),
eq(assignment))).thenReturn(asList(task00, task01));
+ when(activeTaskCreator.createTasks(any(), eq(assignment)))
+ .thenReturn(singletonList(task00));
taskManager.handleAssignment(assignment, emptyMap());
- assertThat(task00.state(), is(Task.State.CREATED));
- assertThat(task01.state(), is(Task.State.CREATED));
+ verify(tasks).addPendingTasksToInit(singletonList(task00));
- assertThat(taskManager.tryToCompleteRestoration(time.milliseconds(),
null), is(false));
+ when(tasks.drainPendingTasksToInit()).thenReturn(Set.of(task00));
+ final LockException lockException = new LockException("can't lock");
+ doThrow(lockException).when(task00).initializeIfNeeded();
+ when(tasks.hasPendingTasksToInit()).thenReturn(true);
- assertThat(task00.state(), is(Task.State.CREATED));
- assertThat(task01.state(), is(Task.State.CREATED));
- assertThat(
- taskManager.activeTaskMap(),
- Matchers.equalTo(mkMap(mkEntry(taskId00, task00),
mkEntry(taskId01, task01)))
+ final boolean restorationComplete =
taskManager.checkStateUpdater(time.milliseconds(), noOpResetter);
+
+ assertFalse(restorationComplete);
+ verify(task00).initializeIfNeeded();
+ verify(tasks, times(2)).addPendingTasksToInit(
+ argThat(tasksToInit -> tasksToInit.contains(task00))
);
- assertThat(taskManager.standbyTaskMap(), Matchers.anEmptyMap());
- verify(changeLogReader).enforceRestoreActive();
+ verify(stateUpdater, never()).add(task00);
verifyNoInteractions(consumer);
}
@Test
public void shouldNotCompleteRestorationIfTaskCannotCompleteRestoration() {
- final Map<TaskId, Set<TopicPartition>> assignment = mkMap(
- mkEntry(taskId00, taskId00Partitions)
- );
- final Task task00 = new StateMachineTask(taskId00, taskId00Partitions,
true, stateManager) {
- @Override
- public void completeRestoration(final
java.util.function.Consumer<Set<TopicPartition>> offsetResetter) {
- throw new TimeoutException("timeout!");
- }
- };
-
- when(activeTaskCreator.createTasks(any(),
eq(assignment))).thenReturn(singletonList(task00));
+ final StreamTask task00 = statefulTask(taskId00,
taskId00ChangelogPartitions)
+ .withInputPartitions(taskId00Partitions)
+ .inState(State.RESTORING)
+ .build();
- taskManager.handleAssignment(assignment, emptyMap());
+ final TasksRegistry tasks = mock(TasksRegistry.class);
+ final TaskManager taskManager =
setUpTaskManagerWithStateUpdater(ProcessingMode.AT_LEAST_ONCE, tasks);
- assertThat(task00.state(), is(Task.State.CREATED));
+ when(stateUpdater.restoresActiveTasks()).thenReturn(true);
+
when(stateUpdater.drainRestoredActiveTasks(any(Duration.class))).thenReturn(Set.of(task00));
+ final TimeoutException timeoutException = new
TimeoutException("timeout!");
+ doThrow(timeoutException).when(task00).completeRestoration(any());
- assertThat(taskManager.tryToCompleteRestoration(time.milliseconds(),
null), is(false));
+ final boolean restorationComplete =
taskManager.checkStateUpdater(time.milliseconds(), noOpResetter);
- assertThat(task00.state(), is(Task.State.RESTORING));
- assertThat(
- taskManager.activeTaskMap(),
- Matchers.equalTo(mkMap(mkEntry(taskId00, task00)))
- );
- assertThat(taskManager.standbyTaskMap(), Matchers.anEmptyMap());
- verify(changeLogReader).enforceRestoreActive();
+ assertFalse(restorationComplete);
+ verify(task00).completeRestoration(any());
+ verify(stateUpdater).add(task00);
+ verify(tasks, never()).addTask(task00);
+ verify(consumer, never()).resume(task00.inputPartitions());
verifyNoInteractions(consumer);
}
@Test
public void shouldSuspendActiveTasksDuringRevocation() {
- final StateMachineTask task00 = new StateMachineTask(taskId00,
taskId00Partitions, true, stateManager);
+ final StreamTask task00 = statefulTask(taskId00,
taskId00ChangelogPartitions)
+ .withInputPartitions(taskId00Partitions)
+ .inState(State.RUNNING)
+ .build();
+
+ final TasksRegistry tasks = mock(TasksRegistry.class);
+ when(tasks.allTasks()).thenReturn(Set.of(task00));
+
final Map<TopicPartition, OffsetAndMetadata> offsets =
singletonMap(t1p0, new OffsetAndMetadata(0L, null));
- task00.setCommittableOffsetsAndMetadata(offsets);
- when(consumer.assignment()).thenReturn(assignment);
- when(activeTaskCreator.createTasks(any(),
eq(taskId00Assignment))).thenReturn(singletonList(task00));
+ when(task00.commitNeeded()).thenReturn(true);
+ when(task00.prepareCommit(true)).thenReturn(offsets);
+ doNothing().when(task00).postCommit(true);
+ doNothing().when(task00).suspend();
Review Comment:
oh wow! yess, nice! Remvoed in f634443
--
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]
