cadonna commented on code in PR #12600:
URL: https://github.com/apache/kafka/pull/12600#discussion_r964788770
##########
streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java:
##########
@@ -421,73 +421,120 @@ private void classifyTasksWithoutStateUpdater(final
Map<TaskId, Set<TopicPartiti
}
}
- private void classifyRunningTasks(final Map<TaskId, Set<TopicPartition>>
activeTasksToCreate,
- final Map<TaskId, Set<TopicPartition>>
standbyTasksToCreate,
- final Map<Task, Set<TopicPartition>>
tasksToRecycle,
- final Set<Task> tasksToCloseClean) {
+ private void classifyRunningAndSuspendedTasks(final Map<TaskId,
Set<TopicPartition>> activeTasksToCreate,
+ final Map<TaskId,
Set<TopicPartition>> standbyTasksToCreate,
+ final Map<Task,
Set<TopicPartition>> tasksToRecycle,
+ final Set<Task>
tasksToCloseClean) {
for (final Task task : tasks.allTasks()) {
+ if (!task.isActive()) {
+ throw new IllegalStateException("Standby tasks should only be
managed by the state updater");
+ }
final TaskId taskId = task.id();
if (activeTasksToCreate.containsKey(taskId)) {
- if (task.isActive()) {
- final Set<TopicPartition> topicPartitions =
activeTasksToCreate.get(taskId);
- if (tasks.updateActiveTaskInputPartitions(task,
topicPartitions)) {
- task.updateInputPartitions(topicPartitions,
topologyMetadata.nodeToSourceTopics(task.id()));
- }
- task.resume();
- } else {
- throw new IllegalStateException("Standby tasks should only
be managed by the state updater");
- }
+ handleReAssignedActiveTask(task,
activeTasksToCreate.get(taskId));
activeTasksToCreate.remove(taskId);
} else if (standbyTasksToCreate.containsKey(taskId)) {
- if (!task.isActive()) {
- throw new IllegalStateException("Standby tasks should only
be managed by the state updater");
- } else {
- tasksToRecycle.put(task, standbyTasksToCreate.get(taskId));
- }
+ tasksToRecycle.put(task, standbyTasksToCreate.get(taskId));
standbyTasksToCreate.remove(taskId);
} else {
tasksToCloseClean.add(task);
}
}
}
+ private void handleReAssignedActiveTask(final Task task,
+ final Set<TopicPartition>
inputPartitions) {
+ if (tasks.updateActiveTaskInputPartitions(task, inputPartitions)) {
+ task.updateInputPartitions(inputPartitions,
topologyMetadata.nodeToSourceTopics(task.id()));
+ }
+ task.resume();
+ if (task.state() == State.RESTORING) {
+ handleReAssignedRevokedActiveTask(task);
+ }
+ }
+
+ private void handleReAssignedRevokedActiveTask(final Task task) {
+ tasks.removeTask(task);
+ stateUpdater.add(task);
+ }
+
private void classifyTasksWithStateUpdater(final Map<TaskId,
Set<TopicPartition>> activeTasksToCreate,
final Map<TaskId,
Set<TopicPartition>> standbyTasksToCreate,
final Map<Task,
Set<TopicPartition>> tasksToRecycle,
final Set<Task>
tasksToCloseClean) {
- classifyRunningTasks(activeTasksToCreate, standbyTasksToCreate,
tasksToRecycle, tasksToCloseClean);
+ classifyRunningAndSuspendedTasks(activeTasksToCreate,
standbyTasksToCreate, tasksToRecycle, tasksToCloseClean);
for (final Task task : stateUpdater.getTasks()) {
final TaskId taskId = task.id();
- final Set<TopicPartition> topicPartitions =
activeTasksToCreate.get(taskId);
if (activeTasksToCreate.containsKey(taskId)) {
+ final Set<TopicPartition> inputPartitions =
activeTasksToCreate.get(taskId);
if (task.isActive()) {
- if (!task.inputPartitions().equals(topicPartitions)) {
- stateUpdater.remove(taskId);
- tasks.addPendingTaskToUpdateInputPartitions(taskId,
topicPartitions);
+ if (tasks.removePendingActiveTaskToSuspend(taskId)) {
+ prepareRevokedActiveTaskForResuming(task,
inputPartitions);
+ } else {
+ prepareReAssignedActiveTaskInRestorationForReUse(task,
inputPartitions);
}
} else {
- stateUpdater.remove(taskId);
- tasks.addPendingTaskToRecycle(taskId, topicPartitions);
+ prepareRunningStandbyTaskForRecycling(taskId,
inputPartitions);
}
activeTasksToCreate.remove(taskId);
} else if (standbyTasksToCreate.containsKey(taskId)) {
+ final Set<TopicPartition> topicPartitions =
standbyTasksToCreate.get(taskId);
if (!task.isActive()) {
- if (!task.inputPartitions().equals(topicPartitions)) {
- stateUpdater.remove(taskId);
- tasks.addPendingTaskToUpdateInputPartitions(taskId,
topicPartitions);
- }
+ prepareReAssignedStandbyTaskForRunning(task,
topicPartitions);
} else {
- stateUpdater.remove(taskId);
- tasks.addPendingTaskToRecycle(taskId, topicPartitions);
+ prepareRevokedActiveTaskForRecycling(taskId,
topicPartitions);
}
standbyTasksToCreate.remove(taskId);
} else {
- stateUpdater.remove(taskId);
- tasks.addPendingTaskToCloseClean(taskId);
+ prepareUnusedTaskInStateUpdaterForCleanClose(taskId);
}
}
Review Comment:
This is the part that needs most attention while reviewing.
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
