Skip to content

Commit

Permalink
Fix sub resource group stats
Browse files Browse the repository at this point in the history
  • Loading branch information
Rongrong Zhong committed Jul 27, 2017
1 parent d50d9b5 commit bda925e
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 13 deletions.
20 changes: 10 additions & 10 deletions ...ain/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroup.java
View file
Expand Up @@ -181,16 +181,16 @@ public ResourceGroupStateInfo getStateInfo()
subGroups.values().stream()
.map(subGroup -> new ResourceGroupInfo(
subGroup.getId(),
DataSize.succinctBytes(softMemoryLimitBytes),
maxRunningQueries,
runningTimeLimit,
maxQueuedQueries,
queuedTimeLimit,
getState(),
eligibleSubGroups.size(),
DataSize.succinctBytes(cachedMemoryUsageBytes),
runningQueries.size() + descendantRunningQueries,
queuedQueries.size() + descendantQueuedQueries))
DataSize.succinctBytes(subGroup.softMemoryLimitBytes),
subGroup.maxRunningQueries,
subGroup.runningTimeLimit,
subGroup.maxQueuedQueries,
subGroup.queuedTimeLimit,
subGroup.getState(),
subGroup.eligibleSubGroups.size(),
DataSize.succinctBytes(subGroup.cachedMemoryUsageBytes),
subGroup.runningQueries.size() + subGroup.descendantRunningQueries,
subGroup.queuedQueries.size() + subGroup.descendantQueuedQueries))
.collect(toImmutableList()));
}
}
Expand Down
26 changes: 23 additions & 3 deletions ...o-main/src/test/java/com/facebook/presto/execution/resourceGroups/TestResourceGroups.java
View file
Expand Up @@ -37,13 +37,15 @@
import static com.facebook.presto.execution.QueryState.FAILED;
import static com.facebook.presto.execution.QueryState.QUEUED;
import static com.facebook.presto.execution.QueryState.RUNNING;
import static com.facebook.presto.spi.resourceGroups.ResourceGroupState.CAN_QUEUE;
import static com.facebook.presto.spi.resourceGroups.ResourceGroupState.CAN_RUN;
import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.QUERY_PRIORITY;
import static com.facebook.presto.spi.resourceGroups.SchedulingPolicy.WEIGHTED;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static io.airlift.testing.Assertions.assertGreaterThan;
import static io.airlift.testing.Assertions.assertLessThan;
import static io.airlift.units.DataSize.Unit.BYTE;
import static io.airlift.units.DataSize.Unit.GIGABYTE;
import static io.airlift.units.DataSize.Unit.MEGABYTE;
import static java.util.Collections.reverse;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
Expand Down Expand Up @@ -480,18 +482,18 @@ public void testGetInfo()
public void testGetResourceGroupStateInfo()
{
RootInternalResourceGroup root = new RootInternalResourceGroup("root", (group, export) -> { }, directExecutor());
root.setSoftMemoryLimit(new DataSize(1, MEGABYTE));
root.setSoftMemoryLimit(new DataSize(1, GIGABYTE));
root.setMaxQueuedQueries(40);
root.setMaxRunningQueries(10);
root.setSchedulingPolicy(WEIGHTED);

InternalResourceGroup rootA = root.getOrCreateSubGroup("a");
rootA.setSoftMemoryLimit(new DataSize(1, MEGABYTE));
rootA.setSoftMemoryLimit(new DataSize(10, MEGABYTE));
rootA.setMaxQueuedQueries(20);
rootA.setMaxRunningQueries(0);

InternalResourceGroup rootB = root.getOrCreateSubGroup("b");
rootB.setSoftMemoryLimit(new DataSize(1, MEGABYTE));
rootB.setSoftMemoryLimit(new DataSize(5, MEGABYTE));
rootB.setMaxQueuedQueries(20);
rootB.setMaxRunningQueries(1);
rootB.setSchedulingWeight(2);
Expand All @@ -518,7 +520,25 @@ public void testGetResourceGroupStateInfo()
assertEquals(stateInfo.getMemoryUsage(), new DataSize(0, BYTE));
assertEquals(stateInfo.getSubGroups().size(), 2);
assertEquals(stateInfo.getSubGroups().get(0).getId(), rootA.getId());
assertEquals(stateInfo.getSubGroups().get(0).getState(), CAN_QUEUE);
assertEquals(stateInfo.getSubGroups().get(0).getSoftMemoryLimit(), rootA.getSoftMemoryLimit());
assertEquals(stateInfo.getSubGroups().get(0).getRunningTimeLimit(), rootA.getRunningTimeLimit());
assertEquals(stateInfo.getSubGroups().get(0).getQueuedTimeLimit(), rootA.getQueuedTimeLimit());
assertEquals(stateInfo.getSubGroups().get(0).getMaxRunningQueries(), rootA.getMaxRunningQueries());
assertEquals(stateInfo.getSubGroups().get(0).getMaxQueuedQueries(), rootA.getMaxQueuedQueries());
assertEquals(stateInfo.getSubGroups().get(0).getNumEligibleSubGroups(), 2);
assertEquals(stateInfo.getSubGroups().get(0).getNumAggregatedRunningQueries(), 0);
assertEquals(stateInfo.getSubGroups().get(0).getNumAggregatedQueuedQueries(), 10);
assertEquals(stateInfo.getSubGroups().get(1).getId(), rootB.getId());
assertEquals(stateInfo.getSubGroups().get(1).getState(), CAN_QUEUE);
assertEquals(stateInfo.getSubGroups().get(1).getSoftMemoryLimit(), rootB.getSoftMemoryLimit());
assertEquals(stateInfo.getSubGroups().get(1).getRunningTimeLimit(), rootA.getRunningTimeLimit());
assertEquals(stateInfo.getSubGroups().get(1).getQueuedTimeLimit(), rootA.getQueuedTimeLimit());
assertEquals(stateInfo.getSubGroups().get(1).getMaxRunningQueries(), rootB.getMaxRunningQueries());
assertEquals(stateInfo.getSubGroups().get(1).getMaxQueuedQueries(), rootB.getMaxQueuedQueries());
assertEquals(stateInfo.getSubGroups().get(1).getNumEligibleSubGroups(), 0);
assertEquals(stateInfo.getSubGroups().get(1).getNumAggregatedRunningQueries(), 1);
assertEquals(stateInfo.getSubGroups().get(1).getNumAggregatedQueuedQueries(), 9);
assertEquals(stateInfo.getMaxRunningQueries(), root.getMaxRunningQueries());
assertEquals(stateInfo.getRunningTimeLimit(), new Duration(Long.MAX_VALUE, MILLISECONDS));
assertEquals(stateInfo.getMaxQueuedQueries(), root.getMaxQueuedQueries());
Expand Down

0 comments on commit bda925e

Please sign in to comment.