Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Reduce lock contention in HttpRemoteTask #13934

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
merged 5 commits into from
Sep 2, 2022
Merged

Reduce lock contention in HttpRemoteTask #13934

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f683b7a
Add explicit synchronization section
sopel39 Aug 31, 2022
cbddf8d
Move sentDynamicFiltersVersion out of critical section
sopel39 Aug 31, 2022
0df2757
Move sendPlan out of critical section
sopel39 Aug 31, 2022
61303af
Make outputBuffers fully atomic
sopel39 Aug 31, 2022
00cf20a
Reduce lock contention in HttpRemoteTask
sopel39 Aug 31, 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
Prev Previous commit
Reduce lock contention in HttpRemoteTask 
Use separate locks for sending a new request
(which is potentially expensive) and modifying
HttpRemoteTask state.
  • Loading branch information
@sopel39
sopel39 committed Aug 31, 2022
commit 00cf20ae345e3fea08d1221dc63095477837faac
38 changes: 21 additions & 17 deletions core/trino-main/src/main/java/io/trino/server/remotetask/HttpRemoteTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ public final class HttpRemoteTask
// The version of dynamic filters that has been successfully sent to the worker
private final AtomicLong sentDynamicFiltersVersion = new AtomicLong(INITIAL_DYNAMIC_FILTERS_VERSION);

@GuardedBy("this")
@GuardedBy("httpClient")
private Future<?> currentRequest;
@GuardedBy("this")
@GuardedBy("httpClient")
private long currentRequestStartNanos;

@GuardedBy("this")
Expand Down Expand Up @@ -584,9 +584,9 @@ private void triggerUpdate()
}
}

private synchronized void sendUpdate()
private void sendUpdate()
{
synchronized (this) {
synchronized (httpClient) {
TaskStatus taskStatus = getTaskStatus();
// don't update if the task hasn't been started yet or if it is already finished
if (!started.get() || taskStatus.getState().isDone()) {
Expand Down Expand Up @@ -692,26 +692,30 @@ public synchronized void cancel()
}
}

private synchronized void cleanUpTask()
private void cleanUpTask()
{
checkState(getTaskStatus().getState().isDone(), "attempt to clean up a task that is not done yet");

// clear pending splits to free memory
pendingSplits.clear();
pendingSourceSplitCount = 0;
pendingSourceSplitsWeight = 0;
partitionedSplitCountTracker.setPartitionedSplits(PartitionedSplitsInfo.forZeroSplits());
splitQueueHasSpace = true;
whenSplitQueueHasSpace.complete(null, executor);
synchronized (this) {
pendingSplits.clear();
pendingSourceSplitCount = 0;
pendingSourceSplitsWeight = 0;
partitionedSplitCountTracker.setPartitionedSplits(PartitionedSplitsInfo.forZeroSplits());
splitQueueHasSpace = true;
whenSplitQueueHasSpace.complete(null, executor);
}

// clear pending outbound dynamic filters to free memory
outboundDynamicFiltersCollector.acknowledge(Long.MAX_VALUE);

// cancel pending request
if (currentRequest != null) {
currentRequest.cancel(true);
currentRequest = null;
currentRequestStartNanos = 0;
synchronized (httpClient) {
if (currentRequest != null) {
currentRequest.cancel(true);
currentRequest = null;
currentRequestStartNanos = 0;
}
}

taskStatusFetcher.stop();
Expand Down Expand Up @@ -928,7 +932,7 @@ public void success(TaskInfo value)
outboundDynamicFiltersCollector.acknowledge(currentRequestDynamicFiltersVersion);
sendPlan.set(value.isNeedsPlan());
long currentRequestStartNanos;
synchronized (HttpRemoteTask.this) {
synchronized (httpClient) {
currentRequest = null;
currentRequestStartNanos = HttpRemoteTask.this.currentRequestStartNanos;
}
Expand All @@ -948,7 +952,7 @@ public void failed(Throwable cause)
try (SetThreadName ignored = new SetThreadName("UpdateResponseHandler-%s", taskId)) {
try {
long currentRequestStartNanos;
synchronized (HttpRemoteTask.this) {
synchronized (httpClient) {
currentRequest = null;
currentRequestStartNanos = HttpRemoteTask.this.currentRequestStartNanos;
}
Expand Down