Skip to content

Only schedule FTE task if it received non-replicated splits #17790

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
arhimondr merged 1 commit into from
Jun 8, 2023
Merged

Only schedule FTE task if it received non-replicated splits #17790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions ...o-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
assignment.updatePartition(new PartitionUpdate(
partitionAssignment.getPartitionId(),
planNodeId,
false,
splits,
noMoreSplits));
}
Expand All @@ -153,13 +154,15 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
assignment.updatePartition(new PartitionUpdate(
0,
replicatedSourceId,
false,
replicatedSplits.get(replicatedSourceId),
true));
}
for (PlanNodeId partitionedSourceId : partitionedSources) {
assignment.updatePartition(new PartitionUpdate(
0,
partitionedSourceId,
false,
ImmutableList.of(),
true));
}
Expand All @@ -173,6 +176,7 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
assignment.updatePartition(new PartitionUpdate(
partitionAssignment.getPartitionId(),
partitionedSourceNodeId,
false,
ImmutableList.of(),
true));
}
Expand Down Expand Up @@ -203,6 +207,7 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
assignment.updatePartition(new PartitionUpdate(
partitionAssignment.getPartitionId(),
partitionedSourceNodeId,
false,
ImmutableList.of(),
true));
}
Expand Down Expand Up @@ -232,13 +237,15 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
assignment.updatePartition(new PartitionUpdate(
partitionAssignment.getPartitionId(),
replicatedSourceId,
false,
replicatedSplits.get(replicatedSourceId),
completedSources.contains(replicatedSourceId)));
}
}
assignment.updatePartition(new PartitionUpdate(
partitionAssignment.getPartitionId(),
planNodeId,
true,
ImmutableList.of(split),
false));
partitionAssignment.assignSplit(splitSizeInBytes);
Expand All @@ -257,13 +264,15 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
assignment.updatePartition(new PartitionUpdate(
0,
replicatedSourceId,
false,
replicatedSplits.get(replicatedSourceId),
true));
}
for (PlanNodeId partitionedSourceId : partitionedSources) {
assignment.updatePartition(new PartitionUpdate(
0,
partitionedSourceId,
false,
ImmutableList.of(),
true));
}
Expand All @@ -277,6 +286,7 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
assignment.updatePartition(new PartitionUpdate(
partitionAssignment.getPartitionId(),
partitionedSourceNodeId,
false,
ImmutableList.of(),
true));
}
Expand Down
41 changes: 32 additions & 9 deletions ...in/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,15 +1131,16 @@ public void onSplitAssignment(SplitAssignmentEvent event)
StageExecution stageExecution = getStageExecution(event.getStageId());
AssignmentResult assignment = event.getAssignmentResult();
for (Partition partition : assignment.partitionsAdded()) {
Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.addPartition(partition.partitionId(), partition.nodeRequirements());
scheduledTask.ifPresent(schedulingQueue::addOrUpdate);
stageExecution.addPartition(partition.partitionId(), partition.nodeRequirements());
}
for (PartitionUpdate partitionUpdate : assignment.partitionUpdates()) {
stageExecution.updatePartition(
Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.updatePartition(
partitionUpdate.partitionId(),
partitionUpdate.planNodeId(),
partitionUpdate.readyForScheduling(),
partitionUpdate.splits(),
partitionUpdate.noMoreSplits());
scheduledTask.ifPresent(schedulingQueue::addOrUpdate);
}
assignment.sealedPartitions().forEach(partitionId -> {
Optional<PrioritizedScheduledTask> scheduledTask = stageExecution.sealPartition(partitionId);
Expand Down Expand Up @@ -1300,10 +1301,10 @@ public boolean isExchangeClosed()
return exchangeClosed;
}

public Optional<PrioritizedScheduledTask> addPartition(int partitionId, NodeRequirements nodeRequirements)
public void addPartition(int partitionId, NodeRequirements nodeRequirements)
{
if (getState().isDone()) {
return Optional.empty();
return;
}

ExchangeSinkHandle exchangeSinkHandle = exchange.addSink(partitionId);
Expand All @@ -1323,18 +1324,28 @@ public Optional<PrioritizedScheduledTask> addPartition(int partitionId, NodeRequ
checkState(partitions.putIfAbsent(partitionId, partition) == null, "partition with id %s already exist in stage %s", partitionId, stage.getStageId());
getSourceOutputSelectors().forEach((partition::updateExchangeSourceOutputSelector));
remainingPartitions.add(partitionId);

return Optional.of(PrioritizedScheduledTask.createSpeculative(stage.getStageId(), partitionId, schedulingPriority));
}

public void updatePartition(int partitionId, PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
public Optional<PrioritizedScheduledTask> updatePartition(
int partitionId,
PlanNodeId planNodeId,
boolean readyForScheduling,
List<Split> splits,
boolean noMoreSplits)
{
if (getState().isDone()) {
return;
return Optional.empty();
}

StagePartition partition = getStagePartition(partitionId);
partition.addSplits(planNodeId, splits, noMoreSplits);
if (readyForScheduling && !partition.isTaskScheduled()) {
partition.setTaskScheduled(true);
return Optional.of(PrioritizedScheduledTask.createSpeculative(stage.getStageId(), partitionId, schedulingPriority));
}
else {
return Optional.empty();
}
}

public Optional<PrioritizedScheduledTask> sealPartition(int partitionId)
Expand Down Expand Up @@ -1760,6 +1771,7 @@ private static class StagePartition
private final Set<TaskId> runningTasks = new HashSet<>();
private final Set<PlanNodeId> finalSelectors = new HashSet<>();
private final Set<PlanNodeId> noMoreSplits = new HashSet<>();
private boolean taskScheduled;
Copy link
Copy Markdown
Member

@losipiuk losipiuk Jun 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a great name; at this point task is not scheduled, just merly put in the scheduling queue for scheduling late. Let's keep for now as it at least is in-line with PrioritizedScheduledTask

Copy link
Copy Markdown
Member Author

@linzebing linzebing Jun 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I was using taskCreated, but @arhimondr suggested to change to taskScheduled:)

private boolean finished;

public StagePartition(
Expand Down Expand Up @@ -1951,6 +1963,17 @@ public boolean isRunning()
return !runningTasks.isEmpty();
}

public boolean isTaskScheduled()
{
return taskScheduled;
}

public void setTaskScheduled(boolean taskScheduled)
Comment thread
linzebing marked this conversation as resolved.
Outdated
{
checkArgument(taskScheduled, "taskScheduled must be true");
this.taskScheduled = taskScheduled;
}

public boolean isFinished()
{
return finished;
Expand Down
6 changes: 3 additions & 3 deletions .../trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
if (replicatedSources.contains(planNodeId)) {
replicatedSplits.putAll(planNodeId, splits.values());
for (Integer partitionId : createdTaskPartitions) {
assignment.updatePartition(new PartitionUpdate(partitionId, planNodeId, ImmutableList.copyOf(splits.values()), noMoreSplits));
assignment.updatePartition(new PartitionUpdate(partitionId, planNodeId, false, ImmutableList.copyOf(splits.values()), noMoreSplits));
}
}
else {
Expand All @@ -164,15 +164,15 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
}

for (SubPartition subPartition : subPartitions) {
assignment.updatePartition(new PartitionUpdate(subPartition.getId(), planNodeId, ImmutableList.of(split), false));
assignment.updatePartition(new PartitionUpdate(subPartition.getId(), planNodeId, true, ImmutableList.of(split), false));
}
});
}

if (noMoreSplits) {
completedSources.add(planNodeId);
for (Integer taskPartition : createdTaskPartitions) {
assignment.updatePartition(new PartitionUpdate(taskPartition, planNodeId, ImmutableList.of(), true));
assignment.updatePartition(new PartitionUpdate(taskPartition, planNodeId, false, ImmutableList.of(), true));
}

if (completedSources.containsAll(allSources)) {
Expand Down
2 changes: 2 additions & 0 deletions ...rino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
assignment.updatePartition(new PartitionUpdate(
0,
planNodeId,
true,
ImmutableList.copyOf(splits.values()),
false));
}
if (noMoreSplits) {
assignment.updatePartition(new PartitionUpdate(
0,
planNodeId,
false,
ImmutableList.of(),
true));
completedSources.add(planNodeId);
Expand Down
9 changes: 8 additions & 1 deletion core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import java.util.List;

import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;

/**
Expand All @@ -44,11 +45,17 @@ record Partition(int partitionId, NodeRequirements nodeRequirements)
}
}

record PartitionUpdate(int partitionId, PlanNodeId planNodeId, List<Split> splits, boolean noMoreSplits)
record PartitionUpdate(
int partitionId,
PlanNodeId planNodeId,
boolean readyForScheduling,
List<Split> splits,
boolean noMoreSplits)
{
public PartitionUpdate
{
requireNonNull(planNodeId, "planNodeId is null");
checkArgument(!(readyForScheduling && splits.isEmpty()), "partition update with empty splits marked as ready for scheduling");
splits = ImmutableList.copyOf(requireNonNull(splits, "splits is null"));
}
}
Expand Down
6 changes: 3 additions & 3 deletions core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,15 +665,15 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
if (partitions.add(partition)) {
result.addPartition(new Partition(partition, new NodeRequirements(Optional.empty(), ImmutableSet.of())));
for (PlanNodeId finishedSource : finishedSources) {
result.updatePartition(new PartitionUpdate(partition, finishedSource, ImmutableList.of(), true));
result.updatePartition(new PartitionUpdate(partition, finishedSource, false, ImmutableList.of(), true));
}
}
result.updatePartition(new PartitionUpdate(partition, planNodeId, splits, noMoreSplits));
result.updatePartition(new PartitionUpdate(partition, planNodeId, true, splits, noMoreSplits));
});
if (noMoreSplits) {
finishedSources.add(planNodeId);
for (Integer partition : partitions) {
result.updatePartition(new PartitionUpdate(partition, planNodeId, ImmutableList.of(), true));
result.updatePartition(new PartitionUpdate(partition, planNodeId, false, ImmutableList.of(), true));
}
}
if (finishedSources.containsAll(allSources)) {
Expand Down