Skip to content

Fix the performance problem of InternalResourceGroup.getActiveWorkCount #20269

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
rschlussel merged 1 commit into from
Jul 12, 2023
Merged

Fix the performance problem of InternalResourceGroup.getActiveWorkCount #20269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 11 deletions ...ain/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import com.facebook.presto.execution.ManagedQueryExecution;
import com.facebook.presto.execution.SqlQueryExecution;
import com.facebook.presto.execution.resourceGroups.WeightedFairQueue.Usage;
import com.facebook.presto.metadata.AllNodes;
import com.facebook.presto.metadata.InternalNode;
import com.facebook.presto.metadata.InternalNodeManager;
import com.facebook.presto.server.QueryStateInfo;
import com.facebook.presto.server.ResourceGroupInfo;
Expand All @@ -29,7 +27,6 @@
import com.facebook.presto.spi.resourceGroups.ResourceGroupState;
import com.facebook.presto.spi.resourceGroups.SchedulingPolicy;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
import org.weakref.jmx.Managed;
Expand Down Expand Up @@ -1021,13 +1018,6 @@ private boolean canQueueMore()
}
}

private int getActiveWorkerCount()
{
AllNodes allNodes = nodeManager.getAllNodes();
Set<InternalNode> activeWorkers = Sets.difference(Sets.difference(allNodes.getActiveNodes(), allNodes.getActiveResourceManagers()), allNodes.getActiveCatalogServers());
return activeWorkers.size();
}

private boolean canRunMore()
{
checkState(Thread.holdsLock(root), "Must hold lock");
Expand All @@ -1052,7 +1042,7 @@ private boolean canRunMore()
if (resourceGroupRuntimeInfo.isPresent()) {
totalRunningQueries += resourceGroupRuntimeInfo.get().getRunningQueries() + resourceGroupRuntimeInfo.get().getDescendantRunningQueries();
}
int activeWorkerCount = getActiveWorkerCount();
int activeWorkerCount = nodeManager.getAllNodes().getActiveWorkerCount();

return totalRunningQueries < hardConcurrencyLimit && cachedMemoryUsageBytes <= softMemoryLimitBytes && totalRunningQueries * workersPerQueryLimit <= activeWorkerCount;
}
Expand Down
9 changes: 9 additions & 0 deletions presto-main/src/main/java/com/facebook/presto/metadata/AllNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package com.facebook.presto.metadata;

import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;

import java.util.Objects;
import java.util.Set;
Expand All @@ -28,6 +29,7 @@ public class AllNodes
private final Set<InternalNode> activeCoordinators;
private final Set<InternalNode> activeResourceManagers;
private final Set<InternalNode> activeCatalogServers;
private final int activeWorkerCount;

public AllNodes(
Set<InternalNode> activeNodes,
Expand All @@ -43,13 +45,20 @@ public AllNodes(
this.activeCoordinators = ImmutableSet.copyOf(requireNonNull(activeCoordinators, "activeCoordinators is null"));
this.activeResourceManagers = ImmutableSet.copyOf(requireNonNull(activeResourceManagers, "activeResourceManagers is null"));
this.activeCatalogServers = ImmutableSet.copyOf(requireNonNull(activeCatalogServers, "activeCatalogServers is null"));

this.activeWorkerCount = Sets.difference(Sets.difference(activeNodes, activeResourceManagers), activeCatalogServers).size();
}

public Set<InternalNode> getActiveNodes()
{
return activeNodes;
}

public int getActiveWorkerCount()
{
return activeWorkerCount;
}

public Set<InternalNode> getInactiveNodes()
{
return inactiveNodes;
Expand Down