Skip to content

Ignore finished tasks when computing memory usage for stage #11801

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
Apr 6, 2022
Merged

Ignore finished tasks when computing memory usage for stage #11801

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
bba01cb
Use precomputed stats counters
losipiuk Apr 5, 2022
a84708a
Reset memory accounting for finished tasks
losipiuk Apr 5, 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
12 changes: 12 additions & 0 deletions core/trino-main/src/main/java/io/trino/execution/SqlStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,14 @@ private class MemoryUsageListener
{
private long previousUserMemory;
private long previousRevocableMemory;
private boolean finalUsageReported;

@Override
public synchronized void stateChanged(TaskStatus taskStatus)
{
if (finalUsageReported) {
return;
}
long currentUserMemory = taskStatus.getMemoryReservation().toBytes();
long currentRevocableMemory = taskStatus.getRevocableMemoryReservation().toBytes();
long deltaUserMemoryInBytes = currentUserMemory - previousUserMemory;
Expand All @@ -305,6 +309,14 @@ public synchronized void stateChanged(TaskStatus taskStatus)
previousUserMemory = currentUserMemory;
previousRevocableMemory = currentRevocableMemory;
stateMachine.updateMemoryUsage(deltaUserMemoryInBytes, deltaRevocableMemoryInBytes, deltaTotalMemoryInBytes);

if (taskStatus.getState().isDone()) {
// if task is finished perform final memory update to 0
stateMachine.updateMemoryUsage(-currentUserMemory, -currentRevocableMemory, -(currentUserMemory + currentRevocableMemory));
previousUserMemory = 0;
previousRevocableMemory = 0;
finalUsageReported = true;
}
}
}
}
12 changes: 3 additions & 9 deletions core/trino-main/src/main/java/io/trino/execution/StageStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,9 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)

long cumulativeUserMemory = 0;
long failedCumulativeUserMemory = 0;
long userMemoryReservation = 0;
long revocableMemoryReservation = 0;
long totalMemoryReservation = 0;
long userMemoryReservation = currentUserMemory.get();
long revocableMemoryReservation = currentRevocableMemory.get();
long totalMemoryReservation = currentTotalMemory.get();
long peakUserMemoryReservation = peakUserMemory.get();
long peakRevocableMemoryReservation = peakRevocableMemory.get();

Expand Down Expand Up @@ -459,12 +459,6 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
failedCumulativeUserMemory += taskStats.getCumulativeUserMemory();
}

long taskUserMemory = taskStats.getUserMemoryReservation().toBytes();
long taskRevocableMemory = taskStats.getRevocableMemoryReservation().toBytes();
userMemoryReservation += taskUserMemory;
revocableMemoryReservation += taskRevocableMemory;
totalMemoryReservation += taskUserMemory + taskRevocableMemory;

totalScheduledTime += taskStats.getTotalScheduledTime().roundTo(NANOSECONDS);
totalCpuTime += taskStats.getTotalCpuTime().roundTo(NANOSECONDS);
totalBlockedTime += taskStats.getTotalBlockedTime().roundTo(NANOSECONDS);
Expand Down