Skip to content

KAFKA-10199: Change to RUNNING if no pending task to recycle exist #14145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cadonna merged 2 commits into from
Aug 4, 2023
Merged

KAFKA-10199: Change to RUNNING if no pending task to recycle exist #14145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19b8c70
KAFKA-10199: Change to RUNNING if no pending task to recycle exist
cadonna Aug 3, 2023
a92179e
Rename pendingTasksToRecycleExist to hasPendingTaskToRecycle
cadonna Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ public boolean checkStateUpdater(final long now,
if (stateUpdater.restoresActiveTasks()) {
handleRestoredTasksFromStateUpdater(now, offsetResetter);
}
return !stateUpdater.restoresActiveTasks();
return !stateUpdater.restoresActiveTasks() && !tasks.hasPendingTasksToRecycle();
}

private void recycleTaskFromStateUpdater(final Task task,
Expand Down
5 changes: 5 additions & 0 deletions streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ public void addPendingTaskToRecycle(final TaskId taskId, final Set<TopicPartitio
pendingUpdateActions.put(taskId, PendingUpdateAction.createRecycleTask(inputPartitions));
}

@Override
public boolean hasPendingTasksToRecycle() {
return pendingUpdateActions.values().stream().anyMatch(action -> action.getAction() == Action.RECYCLE);
}

@Override
public Set<TopicPartition> removePendingTaskToUpdateInputPartitions(final TaskId taskId) {
if (containsTaskIdWithAction(taskId, Action.UPDATE_INPUT_PARTITIONS)) {
Expand Down
2 changes: 2 additions & 0 deletions streams/src/main/java/org/apache/kafka/streams/processor/internals/TasksRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public interface TasksRegistry {

Set<TopicPartition> removePendingTaskToRecycle(final TaskId taskId);

boolean hasPendingTasksToRecycle();

void addPendingTaskToRecycle(final TaskId taskId, final Set<TopicPartition> inputPartitions);

Set<TopicPartition> removePendingTaskToUpdateInputPartitions(final TaskId taskId);
Expand Down
32 changes: 31 additions & 1 deletion streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ public void shouldSuspendRevokedTaskRemovedFromStateUpdater() {
when(tasks.removePendingActiveTaskToSuspend(statefulTask.id())).thenReturn(true);
when(stateUpdater.hasRemovedTasks()).thenReturn(true);
when(stateUpdater.drainRemovedTasks()).thenReturn(mkSet(statefulTask));
final TaskManager taskManager = setUpTaskManager(ProcessingMode.AT_LEAST_ONCE, tasks, true);
taskManager = setUpTaskManager(ProcessingMode.AT_LEAST_ONCE, tasks, true);
replay(consumer);

taskManager.checkStateUpdater(time.milliseconds(), noOpResetter);
Expand All @@ -894,6 +894,7 @@ public void shouldSuspendRevokedTaskRemovedFromStateUpdater() {
Mockito.verify(statefulTask).suspend();
Mockito.verify(tasks).addTask(statefulTask);
}

@Test
public void shouldHandleMultipleRemovedTasksFromStateUpdater() {
final StreamTask taskToRecycle0 = statefulTask(taskId00, taskId00ChangelogPartitions)
Expand Down Expand Up @@ -947,6 +948,35 @@ public void shouldHandleMultipleRemovedTasksFromStateUpdater() {
Mockito.verify(stateUpdater).add(taskToUpdateInputPartitions);
}

@Test
public void shouldReturnFalseFromCheckStateUpdaterIfActiveTasksAreRestoring() {
when(stateUpdater.restoresActiveTasks()).thenReturn(true);
final TasksRegistry tasks = mock(TasksRegistry.class);
final TaskManager taskManager = setUpTaskManager(ProcessingMode.AT_LEAST_ONCE, tasks, true);

assertFalse(taskManager.checkStateUpdater(time.milliseconds(), noOpResetter));
}

@Test
public void shouldReturnFalseFromCheckStateUpdaterIfActiveTasksAreNotRestoringButPendingTasksToRecycle() {
when(stateUpdater.restoresActiveTasks()).thenReturn(false);
final TasksRegistry tasks = mock(TasksRegistry.class);
when(tasks.hasPendingTasksToRecycle()).thenReturn(true);
final TaskManager taskManager = setUpTaskManager(ProcessingMode.AT_LEAST_ONCE, tasks, true);

assertFalse(taskManager.checkStateUpdater(time.milliseconds(), noOpResetter));
}

@Test
public void shouldReturnTrueFromCheckStateUpdaterIfActiveTasksAreNotRestoringAndNoPendingTasksToRecycle() {
when(stateUpdater.restoresActiveTasks()).thenReturn(false);
final TasksRegistry tasks = mock(TasksRegistry.class);
when(tasks.hasPendingTasksToRecycle()).thenReturn(false);
final TaskManager taskManager = setUpTaskManager(ProcessingMode.AT_LEAST_ONCE, tasks, true);

assertTrue(taskManager.checkStateUpdater(time.milliseconds(), noOpResetter));
}

@Test
public void shouldAddActiveTaskWithRevokedInputPartitionsInStateUpdaterToPendingTasksToSuspend() {
final StreamTask task = statefulTask(taskId00, taskId00ChangelogPartitions)
Expand Down
25 changes: 25 additions & 0 deletions streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ public class TasksTest {
private final static TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1);
private final static TaskId TASK_0_0 = new TaskId(0, 0);
private final static TaskId TASK_0_1 = new TaskId(0, 1);
private final static TaskId TASK_0_2 = new TaskId(0, 2);
private final static TaskId TASK_1_0 = new TaskId(1, 0);
private final static TaskId TASK_1_1 = new TaskId(1, 1);
private final static TaskId TASK_1_2 = new TaskId(1, 2);

private final Tasks tasks = new Tasks(new LogContext());

Expand Down Expand Up @@ -122,6 +125,28 @@ public void shouldAddAndRemovePendingTaskToRecycle() {
assertNull(tasks.removePendingTaskToRecycle(TASK_0_0));
}

@Test
public void shouldVerifyIfPendingTaskToRecycleExist() {
assertFalse(tasks.hasPendingTasksToRecycle());
tasks.addPendingTaskToRecycle(TASK_0_0, mkSet(TOPIC_PARTITION_A_0));
assertTrue(tasks.hasPendingTasksToRecycle());

tasks.addPendingTaskToRecycle(TASK_1_0, mkSet(TOPIC_PARTITION_A_1));
assertTrue(tasks.hasPendingTasksToRecycle());

tasks.addPendingTaskToCloseClean(TASK_0_1);
tasks.addPendingTaskToCloseDirty(TASK_0_2);
tasks.addPendingTaskToUpdateInputPartitions(TASK_1_1, mkSet(TOPIC_PARTITION_B_0));
tasks.addPendingActiveTaskToSuspend(TASK_1_2);
assertTrue(tasks.hasPendingTasksToRecycle());

tasks.removePendingTaskToRecycle(TASK_0_0);
assertTrue(tasks.hasPendingTasksToRecycle());

tasks.removePendingTaskToRecycle(TASK_1_0);
assertFalse(tasks.hasPendingTasksToRecycle());
}

@Test
public void shouldAddAndRemovePendingTaskToUpdateInputPartitions() {
final Set<TopicPartition> expectedInputPartitions = mkSet(TOPIC_PARTITION_A_0);
Expand Down