Skip to content

Always record new lastLeafSplitsSize (even if timeDifference is 0) #15006

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
sopel39 merged 2 commits into from
Nov 14, 2022
Merged

Always record new lastLeafSplitsSize (even if timeDifference is 0) #15006

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
e2b9ade
Always record new lastLeafSplitsSize (even if timeDifference is 0)
sopel39 Nov 13, 2022
bf7dd4e
Record leaf splits size in same sync section that modifies allSplits
sopel39 Nov 13, 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
10 changes: 7 additions & 3 deletions core/trino-main/src/main/java/io/trino/execution/executor/TaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,10 @@ public void removeTask(TaskHandle taskHandle)
}

// replace blocked splits that were terminated
addNewEntrants();
recordLeafSplitsSize();
synchronized (this) {
addNewEntrants();
recordLeafSplitsSize();
}
}

private void doRemoveTask(TaskHandle taskHandle)
Expand Down Expand Up @@ -480,8 +482,10 @@ private synchronized void recordLeafSplitsSize()
if (timeDifference > 0) {
this.leafSplitsSize.add(lastLeafSplitsSize, timeDifference);
this.lastLeafSplitsSizeRecordTime = now;
this.lastLeafSplitsSize = allSplits.size() - intermediateSplits.size();
}
// always record new lastLeafSplitsSize as it might have changed
// even if timeDifference is 0
this.lastLeafSplitsSize = allSplits.size() - intermediateSplits.size();
}

private class TaskRunner
Expand Down
5 changes: 3 additions & 2 deletions core/trino-main/src/test/java/io/trino/execution/executor/TestTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import static io.airlift.testing.Assertions.assertLessThan;
import static io.trino.execution.executor.MultilevelSplitQueue.LEVEL_CONTRIBUTION_CAP;
import static io.trino.execution.executor.MultilevelSplitQueue.LEVEL_THRESHOLD_SECONDS;
import static java.lang.Double.isNaN;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
Expand Down Expand Up @@ -510,9 +511,9 @@ public void testLeafSplitsSize()
TestingJob driver1 = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, 500);
TestingJob driver2 = new TestingJob(ticker, new Phaser(), new Phaser(), new Phaser(), 1, 1000 / 500);

ticker.increment(1, TimeUnit.SECONDS);
ticker.increment(0, TimeUnit.SECONDS);
taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(driver1, driver2));
assertEquals(taskExecutor.getLeafSplitsSize().getAllTime().getMax(), 0.0);
assertTrue(isNaN(taskExecutor.getLeafSplitsSize().getAllTime().getMax()));

ticker.increment(1, TimeUnit.SECONDS);
taskExecutor.enqueueSplits(testTaskHandle, false, ImmutableList.of(driver1));
Expand Down