Skip to content

Minor improvements to FTE scheduling #18144

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
losipiuk merged 2 commits into from
Jul 6, 2023
Merged

Minor improvements to FTE scheduling #18144

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
f022816
Only resort/update FTE plan if plan after optimization has changed
linzebing Jul 5, 2023
6cb2bda
Change adaptive query execution growth factor to be 1.26
linzebing Jul 5, 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
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ public class QueryManagerConfig
private int remoteTaskGuaranteedSplitPerTask = 3;

private int faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod = 64;
private double faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor = 1.2;
private double faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor = 1.26;
private DataSize faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMin = DataSize.of(512, MEGABYTE);
private DataSize faultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMax = DataSize.of(50, GIGABYTE);

private int faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod = 64;
private double faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor = 1.2;
private double faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor = 1.26;
private DataSize faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMin = DataSize.of(4, GIGABYTE);
private DataSize faultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMax = DataSize.of(50, GIGABYTE);

Expand Down
7 changes: 5 additions & 2 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 @@ -758,9 +758,12 @@ public void onFailure(Throwable t)

private void optimize()
{
SubPlan oldPlan = plan;
plan = optimizePlan(plan);
planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
stageRegistry.updatePlan(plan);
if (plan != oldPlan) {
planInTopologicalOrder = sortPlanInTopologicalOrder(plan);
stageRegistry.updatePlan(plan);
}
}

private SubPlan optimizePlan(SubPlan plan)
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ public void testDefaults()
.setRemoteTaskRequestSizeHeadroom(DataSize.of(2, DataSize.Unit.MEGABYTE))
.setRemoteTaskGuaranteedSplitPerTask(3)
.setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthPeriod(64)
.setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor(1.2)
.setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeGrowthFactor(1.26)
.setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMin(DataSize.of(512, MEGABYTE))
.setFaultTolerantExecutionArbitraryDistributionComputeTaskTargetSizeMax(DataSize.of(50, GIGABYTE))
.setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthPeriod(64)
.setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor(1.2)
.setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeGrowthFactor(1.26)
.setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMin(DataSize.of(4, GIGABYTE))
.setFaultTolerantExecutionArbitraryDistributionWriteTaskTargetSizeMax(DataSize.of(50, GIGABYTE))
.setFaultTolerantExecutionHashDistributionComputeTaskTargetSize(DataSize.of(512, MEGABYTE))
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/sphinx/admin/fault-tolerant-execution.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ properties only apply to a ``TASK`` retry policy.
distribution for fault-tolerant execution. Lower bound is 1.0. For every
task size increase, new task target size is old task target size
multiplied by this growth factor.
- ``1.2``
- ``1.26``
* - ``fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-min``
- Initial/minimum target input :ref:`data size <prop-type-data-size>` for
non-writer tasks of arbitrary distribution of fault-tolerant execution.
Expand All @@ -274,7 +274,7 @@ properties only apply to a ``TASK`` retry policy.
distribution for fault-tolerant execution. Lower bound is 1.0. For every
task size increase, new task target size is old task target size
multiplied by this growth factor.
- ``1.2``
- ``1.26``
* - ``fault-tolerant-execution-arbitrary-distribution-write-task-target-size-min``
- Initial/minimum target input :ref:`data size <prop-type-data-size>` for
writer tasks of arbitrary distribution of fault-tolerant execution.
Expand Down