Skip to content

Fix propagation of noMoreSplits flag to running tasks #14794

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 2 commits into from
Oct 27, 2022
Merged

Fix propagation of noMoreSplits flag to running tasks #14794

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
3699003
Add missing synchronization
losipiuk Oct 26, 2022
3beb2c8
Fix propagation of noMoreSplits flag to running tasks
losipiuk Oct 27, 2022
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
15 changes: 15 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 @@ -143,6 +143,13 @@ private AssignmentResult assignReplicatedSplits(PlanNodeId planNodeId, List<Spli
replicatedSplits.get(replicatedSourceId),
true));
}
for (PlanNodeId partitionedSourceId : partitionedSources) {
assignment.updatePartition(new PartitionUpdate(
0,
partitionedSourceId,
ImmutableList.of(),
true));
}
assignment.sealPartition(0);
}
else {
Expand Down Expand Up @@ -232,6 +239,14 @@ private AssignmentResult assignPartitionedSplits(PlanNodeId planNodeId, List<Spl
replicatedSplits.get(replicatedSourceId),
true));
}
for (PlanNodeId partitionedSourceId : partitionedSources) {
assignment.updatePartition(new PartitionUpdate(
0,
partitionedSourceId,
ImmutableList.of(),
true));
}

assignment.sealPartition(0);
}
else {
Expand Down
4 changes: 3 additions & 1 deletion core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ private int getSplitPartition(Split split)

private void fail(Throwable failure)
{
callback.failed(failure);
synchronized (assignerLock) {
callback.failed(failure);
}
close();
}

Expand Down
20 changes: 20 additions & 0 deletions ...in/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import static java.util.Collections.shuffle;
import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

Expand All @@ -73,6 +74,7 @@ public void testEmpty()
SplitAssigner splitAssigner = createSplitAssigner(ImmutableSet.of(PARTITIONED_1), ImmutableSet.of(), 100, false);
TestingTaskSourceCallback callback = new TestingTaskSourceCallback();
splitAssigner.assign(PARTITIONED_1, ImmutableListMultimap.of(), true).update(callback);
assertTrue(callback.isNoMoreSplits(0, PARTITIONED_1));
splitAssigner.finish().update(callback);
List<TaskDescriptor> taskDescriptors = callback.getTaskDescriptors();
assertThat(taskDescriptors).hasSize(1);
Expand All @@ -82,6 +84,7 @@ public void testEmpty()
splitAssigner = createSplitAssigner(ImmutableSet.of(), ImmutableSet.of(REPLICATED_1), 100, false);
callback = new TestingTaskSourceCallback();
splitAssigner.assign(REPLICATED_1, ImmutableListMultimap.of(), true).update(callback);
assertTrue(callback.isNoMoreSplits(0, REPLICATED_1));
splitAssigner.finish().update(callback);
taskDescriptors = callback.getTaskDescriptors();
assertThat(taskDescriptors).hasSize(1);
Expand All @@ -91,7 +94,11 @@ public void testEmpty()
splitAssigner = createSplitAssigner(ImmutableSet.of(PARTITIONED_1), ImmutableSet.of(REPLICATED_1), 100, true);
callback = new TestingTaskSourceCallback();
splitAssigner.assign(REPLICATED_1, ImmutableListMultimap.of(), true).update(callback);
assertFalse(callback.isNoMoreSplits(0, PARTITIONED_1));
assertFalse(callback.isNoMoreSplits(0, REPLICATED_1));
splitAssigner.assign(PARTITIONED_1, ImmutableListMultimap.of(), true).update(callback);
assertTrue(callback.isNoMoreSplits(0, PARTITIONED_1));
assertTrue(callback.isNoMoreSplits(0, REPLICATED_1));
splitAssigner.finish().update(callback);
taskDescriptors = callback.getTaskDescriptors();
assertThat(taskDescriptors).hasSize(1);
Expand All @@ -100,7 +107,11 @@ public void testEmpty()
splitAssigner = createSplitAssigner(ImmutableSet.of(PARTITIONED_1), ImmutableSet.of(REPLICATED_1), 100, true);
callback = new TestingTaskSourceCallback();
splitAssigner.assign(PARTITIONED_1, ImmutableListMultimap.of(), true).update(callback);
assertFalse(callback.isNoMoreSplits(0, PARTITIONED_1));
assertFalse(callback.isNoMoreSplits(0, REPLICATED_1));
splitAssigner.assign(REPLICATED_1, ImmutableListMultimap.of(), true).update(callback);
assertTrue(callback.isNoMoreSplits(0, PARTITIONED_1));
assertTrue(callback.isNoMoreSplits(0, REPLICATED_1));
splitAssigner.finish().update(callback);
taskDescriptors = callback.getTaskDescriptors();
assertThat(taskDescriptors).hasSize(1);
Expand All @@ -111,7 +122,16 @@ public void testEmpty()
splitAssigner.assign(REPLICATED_1, ImmutableListMultimap.of(), true).update(callback);
splitAssigner.assign(PARTITIONED_1, ImmutableListMultimap.of(), true).update(callback);
splitAssigner.assign(PARTITIONED_2, ImmutableListMultimap.of(), true).update(callback);
assertFalse(callback.isNoMoreSplits(0, PARTITIONED_1));
assertFalse(callback.isNoMoreSplits(0, REPLICATED_1));
assertFalse(callback.isNoMoreSplits(0, PARTITIONED_2));
assertFalse(callback.isNoMoreSplits(0, REPLICATED_2));
splitAssigner.assign(REPLICATED_2, ImmutableListMultimap.of(), true).update(callback);
assertTrue(callback.isNoMoreSplits(0, PARTITIONED_1));
assertTrue(callback.isNoMoreSplits(0, REPLICATED_1));
assertTrue(callback.isNoMoreSplits(0, PARTITIONED_2));
assertTrue(callback.isNoMoreSplits(0, REPLICATED_2));

splitAssigner.finish().update(callback);
taskDescriptors = callback.getTaskDescriptors();
assertThat(taskDescriptors).hasSize(1);
Expand Down