diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/resourcetypes/ResourceTypesTestHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/resourcetypes/ResourceTypesTestHelper.java index 98a8a003b2c..3c3c2cce2d1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/resourcetypes/ResourceTypesTestHelper.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/resourcetypes/ResourceTypesTestHelper.java @@ -16,6 +16,7 @@ package org.apache.hadoop.yarn.resourcetypes; +import com.google.common.collect.Maps; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceInformation; import org.apache.hadoop.yarn.factories.RecordFactory; @@ -24,6 +25,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * Contains helper methods to create Resource and ResourceInformation objects. @@ -90,4 +92,24 @@ private static ResourceValueAndUnit getResourceValueAndUnit(String val) { return new ResourceValueAndUnit(value, matcher.group(2)); } + public static Map extractCustomResources(Resource res) { + Map customResources = Maps.newHashMap(); + for (int i = 0; i < res.getResources().length; i++) { + ResourceInformation ri = res.getResourceInformation(i); + if (!ri.getName().equals(ResourceInformation.MEMORY_URI) + && !ri.getName().equals(ResourceInformation.VCORES_URI)) { + customResources.put(ri.getName(), ri.getValue()); + } + } + return customResources; + } + + public static Map extractCustomResourcesAsStrings( + Resource res) { + Map resValues = extractCustomResources(res); + return resValues.entrySet().stream() + .collect(Collectors.toMap( + Map.Entry::getKey, e -> String.valueOf(e.getValue()))); + } + } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java index 20a5a1ff790..656cc5d7fcf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java @@ -45,7 +45,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState; -import org.apache.hadoop.yarn.server.utils.BuilderUtils; +import org.apache.hadoop.yarn.util.resource.ResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -114,6 +114,7 @@ protected final MetricsSystem metricsSystem; protected final Map users; protected final Configuration conf; + QueueMetricsForCustomResources queueMetricsForCustomResources; protected QueueMetrics(MetricsSystem ms, String queueName, Queue parent, boolean enableUserMetrics, Configuration conf) { @@ -125,6 +126,10 @@ protected QueueMetrics(MetricsSystem ms, String queueName, Queue parent, metricsSystem = ms; this.conf = conf; runningTime = buildBuckets(conf); + + if (ResourceUtils.getNumberOfKnownResourceTypes() > 2) { + this.queueMetricsForCustomResources = new QueueMetricsForCustomResources(); + } } protected QueueMetrics tag(MetricsInfo info, String value) { @@ -350,9 +355,12 @@ public void moveAppTo(AppSchedulingInfo app) { * @param limit resource limit */ public void setAvailableResourcesToQueue(String partition, Resource limit) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { availableMB.set(limit.getMemorySize()); availableVCores.set(limit.getVirtualCores()); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.setAvailable(limit); + } } } @@ -392,7 +400,7 @@ public void setAvailableResourcesToUser(String partition, */ public void incrPendingResources(String partition, String user, int containers, Resource res) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { _incrPendingResources(containers, res); QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { @@ -408,12 +416,15 @@ private void _incrPendingResources(int containers, Resource res) { pendingContainers.incr(containers); pendingMB.incr(res.getMemorySize() * containers); pendingVCores.incr(res.getVirtualCores() * containers); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.increasePending(res, containers); + } } public void decrPendingResources(String partition, String user, int containers, Resource res) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { _decrPendingResources(containers, res); QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { @@ -429,6 +440,9 @@ private void _decrPendingResources(int containers, Resource res) { pendingContainers.decr(containers); pendingMB.decr(res.getMemorySize() * containers); pendingVCores.decr(res.getVirtualCores() * containers); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.decreasePending(res, containers); + } } public void incrNodeTypeAggregations(String user, NodeType type) { @@ -452,12 +466,16 @@ public void incrNodeTypeAggregations(String user, NodeType type) { public void allocateResources(String partition, String user, int containers, Resource res, boolean decrPending) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { allocatedContainers.incr(containers); aggregateContainersAllocated.incr(containers); allocatedMB.incr(res.getMemorySize() * containers); allocatedVCores.incr(res.getVirtualCores() * containers); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.increaseAllocated(res, containers); + } + if (decrPending) { _decrPendingResources(containers, res); } @@ -479,12 +497,18 @@ public void allocateResources(String partition, String user, * @param res */ public void allocateResources(String partition, String user, Resource res) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { allocatedMB.incr(res.getMemorySize()); allocatedVCores.incr(res.getVirtualCores()); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.increaseAllocated(res); + } pendingMB.decr(res.getMemorySize()); pendingVCores.decr(res.getVirtualCores()); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.decreasePending(res); + } QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { @@ -498,11 +522,15 @@ public void allocateResources(String partition, String user, Resource res) { public void releaseResources(String partition, String user, int containers, Resource res) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { allocatedContainers.decr(containers); aggregateContainersReleased.incr(containers); allocatedMB.decr(res.getMemorySize() * containers); allocatedVCores.decr(res.getVirtualCores() * containers); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.decreaseAllocated(res, containers); + } + QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { userMetrics.releaseResources(partition, user, containers, res); @@ -519,9 +547,13 @@ public void releaseResources(String partition, * @param user * @param res */ - public void releaseResources(String user, Resource res) { + private void releaseResources(String user, Resource res) { allocatedMB.decr(res.getMemorySize()); allocatedVCores.decr(res.getVirtualCores()); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.decreaseAllocated(res); + } + QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { userMetrics.releaseResources(user, res); @@ -552,8 +584,19 @@ public void updatePreemptedVcoreSeconds(long vcoreSeconds) { } } + public void updatePreemptedSecondsForCustomResources(Resource res, + long seconds) { + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources + .increaseAggregatedPreemptedSeconds(res, seconds); + } + if (parent != null) { + parent.updatePreemptedSecondsForCustomResources(res, seconds); + } + } + public void reserveResource(String partition, String user, Resource res) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { reserveResource(user, res); } } @@ -562,6 +605,9 @@ public void reserveResource(String user, Resource res) { reservedContainers.incr(); reservedMB.incr(res.getMemorySize()); reservedVCores.incr(res.getVirtualCores()); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.increaseReserved(res); + } QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { userMetrics.reserveResource(user, res); @@ -571,10 +617,13 @@ public void reserveResource(String user, Resource res) { } } - public void unreserveResource(String user, Resource res) { + private void unreserveResource(String user, Resource res) { reservedContainers.decr(); reservedMB.decr(res.getMemorySize()); reservedVCores.decr(res.getVirtualCores()); + if (queueMetricsForCustomResources != null) { + queueMetricsForCustomResources.decreaseReserved(res); + } QueueMetrics userMetrics = getUserMetrics(user); if (userMetrics != null) { userMetrics.unreserveResource(user, res); @@ -585,7 +634,7 @@ public void unreserveResource(String user, Resource res) { } public void unreserveResource(String partition, String user, Resource res) { - if(partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { + if (partition == null || partition.equals(RMNodeLabelsManager.NO_LABEL)) { unreserveResource(user, res); } } @@ -647,10 +696,23 @@ public int getAppsKilled() { public int getAppsFailed() { return appsFailed.value(); } - + public Resource getAllocatedResources() { - return BuilderUtils.newResource(allocatedMB.value(), - (int) allocatedVCores.value()); + if (queueMetricsForCustomResources != null && + queueMetricsForCustomResources.isThereAnyAllocatedResource()) { + return Resource.newInstance(allocatedMB.value(), allocatedVCores.value(), + queueMetricsForCustomResources.getAllocatedValues()); + } + return Resource.newInstance(allocatedMB.value(), + allocatedVCores.value()); + } + + public float getMaxUtilizationOfCustomResources(Resource clusterResource) { + if (queueMetricsForCustomResources != null) { + return queueMetricsForCustomResources + .getMaxAllocationUtilization(clusterResource); + } + return 0; } public long getAllocatedMB() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsCustomResource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsCustomResource.java new file mode 100644 index 00000000000..ff9e6d2ce44 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsCustomResource.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler; + +import com.google.common.collect.Maps; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.api.records.ResourceInformation; +import org.apache.hadoop.yarn.util.resource.ResourceUtils; + +import java.util.Map; +import java.util.function.BiFunction; + +public class QueueMetricsCustomResource { + protected final Map values = Maps.newHashMap(); + + protected void increase(Resource res) { + update(res, Long::sum); + } + + protected void increaseWithMultiplier(Resource res, long multiplier) { + update(res, (v1, v2) -> v1 + v2 * multiplier); + } + + protected void decrease(Resource res) { + update(res, (v1, v2) -> v1 - v2); + } + + protected void decreaseWithMultiplier(Resource res, int containers) { + update(res, (v1, v2) -> v1 - v2 * containers); + } + + protected void set(Resource res) { + update(res, (v1, v2) -> v2); + } + + private void update(Resource res, BiFunction operation) { + if (ResourceUtils.getNumberOfKnownResourceTypes() > 2) { + ResourceInformation[] resources = res.getResources(); + + for (int i = 2; i < resources.length; i++) { + ResourceInformation resource = resources[i]; + + // Map.merge only applies operation if there is a value for the key in + // the map + if (!values.containsKey(resource.getName())) { + values.put(resource.getName(), 0L); + } + values.merge(resource.getName(), + resource.getValue(), operation); + } + } + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsForCustomResources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsForCustomResources.java new file mode 100644 index 00000000000..8590728e0ae --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsForCustomResources.java @@ -0,0 +1,127 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.hadoop.yarn.api.records.Resource; + +import java.util.Map; + +public class QueueMetricsForCustomResources { + private final QueueMetricsCustomResource + aggregatePreemptedSeconds = + new QueueMetricsCustomResource(); + private final QueueMetricsCustomResource allocated = + new QueueMetricsCustomResource(); + private final QueueMetricsCustomResource available = + new QueueMetricsCustomResource(); + private final QueueMetricsCustomResource pending = + new QueueMetricsCustomResource(); + private final QueueMetricsCustomResource reserved = + new QueueMetricsCustomResource(); + + public void increaseReserved(Resource res) { + reserved.increase(res); + } + + public void decreaseReserved(Resource res) { + reserved.decrease(res); + } + + public void setAvailable(Resource res) { + available.set(res); + } + + public void increasePending(Resource res, int containers) { + pending.increaseWithMultiplier(res, containers); + } + + public void decreasePending(Resource res) { + pending.decrease(res); + } + + public void decreasePending(Resource res, int containers) { + pending.decreaseWithMultiplier(res, containers); + } + + public void increaseAllocated(Resource res) { + allocated.increase(res); + } + + public void increaseAllocated(Resource res, int containers) { + allocated.increaseWithMultiplier(res, containers); + } + + public void decreaseAllocated(Resource res) { + allocated.decrease(res); + } + + public void decreaseAllocated(Resource res, int containers) { + allocated.decreaseWithMultiplier(res, containers); + } + + public void increaseAggregatedPreemptedSeconds(Resource res, long seconds) { + aggregatePreemptedSeconds.increaseWithMultiplier(res, seconds); + } + + public boolean isThereAnyAllocatedResource() { + return allocated.values.size() > 0; + } + + public Map getAllocatedValues() { + return allocated.values; + } + + @VisibleForTesting + public QueueMetricsCustomResource getAvailable() { + return available; + } + + @VisibleForTesting + public QueueMetricsCustomResource getPending() { + return pending; + } + + @VisibleForTesting + public QueueMetricsCustomResource getReserved() { + return reserved; + } + + @VisibleForTesting + public QueueMetricsCustomResource + getAggregatePreemptedSeconds() { + return aggregatePreemptedSeconds; + } + + public float getMaxAllocationUtilization(Resource clusterResource) { + float maxUtilization = 0; + if (!allocated.values.isEmpty()) { + for (Map.Entry customRes : allocated.values.entrySet()) { + long clusterResourceUtilization = + clusterResource.getResourceValue(customRes.getKey()); + if (clusterResourceUtilization != 0) { + float utilization = + (float) customRes.getValue() / clusterResourceUtilization; + if (utilization > maxUtilization) { + maxUtilization = utilization; + } + } + } + } + return maxUtilization; + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index fddd3614821..c5ad2ce9fa6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -2106,7 +2106,8 @@ protected void completedContainerInternal( private void updateQueuePreemptionMetrics( CSQueue queue, RMContainer rmc) { QueueMetrics qMetrics = queue.getMetrics(); - long usedMillis = rmc.getFinishTime() - rmc.getCreationTime(); + final long usedMillis = rmc.getFinishTime() - rmc.getCreationTime(); + final long usedSeconds = usedMillis / DateUtils.MILLIS_PER_SECOND; Resource containerResource = rmc.getAllocatedResource(); qMetrics.preemptContainer(); long mbSeconds = (containerResource.getMemorySize() * usedMillis) @@ -2115,6 +2116,8 @@ private void updateQueuePreemptionMetrics( / DateUtils.MILLIS_PER_SECOND; qMetrics.updatePreemptedMemoryMBSeconds(mbSeconds); qMetrics.updatePreemptedVcoreSeconds(vcSeconds); + qMetrics.updatePreemptedSecondsForCustomResources(containerResource, + usedSeconds); } @Lock(Lock.NoLock.class) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueHierarchy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueHierarchy.java new file mode 100644 index 00000000000..f3fb4afcc1d --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueHierarchy.java @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler; + +/** + * Stores a queue hierarchy. + * Every queue can have exactly one child queue, this is adequate + * for our testing purposes. + */ +public final class QueueHierarchy { + private static class Queue { + private String name; + private Queue child; + + public Queue(String queueName) { + this.name = queueName; + } + + private int getDepth() { + if (child == null) { + return 1; + } + return child.getDepth() + 1; + } + + private void setChild(String childName) { + this.child = new Queue(childName); + } + } + + private Queue queue; + private int size; + + private QueueHierarchy(String rootName) { + this.queue = new Queue(rootName); + this.size = 1; + } + + public QueueHierarchy addChild(String fullQueueName) { + String[] nameComponents = fullQueueName.split("\\."); + if (nameComponents.length <= 1) { + throw new IllegalArgumentException( + "Cannot add queue " + fullQueueName + " as child queue!"); + } + StringBuilder parentQueueName = new StringBuilder(); + for (int i = 1; i < nameComponents.length; i++) { + String queueName = nameComponents[i - 1]; + Queue parentQueue = getQueue(i - 1); + if (parentQueueName.length() > 0) { + parentQueueName.append("."); + } + parentQueueName.append(queueName); + + //if this is the last component, we found the parent of the queue + if (nameComponents.length == i + 1) { + parentQueue.setChild(fullQueueName); + size++; + } else if (!parentQueue.name.equals(parentQueueName.toString())) { + throw new IllegalArgumentException( + String.format("Cannot find parent queue for child queue %s, " + + "current queue name: %s", fullQueueName, parentQueue.name)); + } + } + + //sanity check + if (size != size()) { + throw new IllegalStateException( + String.format("Queue hierarchy depth should be %d, " + + "actual depth is: %d", size, size())); + } + + return this; + } + + String queueAtLevel(int level) { + int depth = queue.getDepth(); + if (level < 0 || level > depth - 1) { + throw new IllegalArgumentException( + String.format("Level should be between 0 and %d as number of queues" + + "in this hierarchy is: %d", depth - 1, depth)); + } + return getQueue(level).name; + } + + private Queue getQueue(int level) { + if (level == 0) { + return queue; + } + Queue ret = queue; + for (int i = 0; i < level; i++) { + ret = ret.child; + } + return ret; + } + + int size() { + return queue.getDepth(); + } + + public static QueueHierarchy create(String root, String leaf) { + QueueHierarchy queueHierarchy = new QueueHierarchy(root); + queueHierarchy.addChild(leaf); + return queueHierarchy; + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsTestcase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsTestcase.java new file mode 100644 index 00000000000..1792d7ce479 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetricsTestcase.java @@ -0,0 +1,379 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler; + +import com.google.common.collect.Maps; +import org.apache.hadoop.metrics2.MetricsSource; +import org.apache.hadoop.metrics2.MetricsSystem; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.resourcetypes.ResourceTypesTestHelper; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.TestQueueMetrics.MultiQueueSetup; + + +import org.apache.hadoop.yarn.server.resourcemanager.scheduler + .TestQueueMetricsForCustomResources.MetricsForCustomResource; + +import java.util.List; +import java.util.Map; +import java.util.function.BiFunction; + +import static org.apache.hadoop.yarn.resourcetypes.ResourceTypesTestHelper + .extractCustomResources; +import static org.apache.hadoop.yarn.resourcetypes.ResourceTypesTestHelper.extractCustomResourcesAsStrings; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_CONTAINERS_ALLOCATED; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_CONTAINERS_RELEASED; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_MEMORY_MB_SECONDS_PREEMPTED; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_VCORE_SECONDS_PREEMPTED; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_CONTAINERS; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_V_CORES; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.PENDING_CONTAINERS; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.PENDING_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.PENDING_V_CORES; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.RESERVED_CONTAINERS; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.RESERVED_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.RESERVED_V_CORES; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.TestQueueMetricsForCustomResources.assertCustomResourceValue; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.TestQueueMetricsForCustomResources.assertCustomResourceValueInternal; + +public final class QueueMetricsTestcase { + private enum QueueMetricsAssertionType { + ALL, ROOT_ONLY, ROOT_AND_LEAF_ONLY + } + + private enum UserMetricsAssertionType { + ALL, NONE + } + + public static final class Builder { + private MetricsSystem metricsSystem; + private QueueHierarchy queueHierarchy; + private int containers; + private Resource resource; + private Resource resourceToDecrease; + private Map customResourceValues; + private int containersToDecrease; + private String user; + private String partition; + + private Builder() { + } + + public static Builder create() { + return new Builder(); + } + + public Builder withContainers(int containers) { + this.containers = containers; + return this; + } + + public Builder withResourceToDecrease(Resource res, int containers) { + this.resourceToDecrease = res; + this.containersToDecrease = containers; + return this; + } + + public Builder withResources(Resource res) { + this.resource = res; + return this; + } + + public Builder withQueueHierarchy(QueueHierarchy queueHierarchy) { + if (queueHierarchy.size() == 0) { + throw new IllegalStateException("Queue hierarchy should not be empty!"); + } + this.queueHierarchy = queueHierarchy; + return this; + } + + public Builder withUser(String user) { + this.user = user; + return this; + } + + public Builder withPartition(String partition) { + this.partition = partition; + return this; + } + + public Builder withMetricSystem(MetricsSystem ms) { + this.metricsSystem = ms; + return this; + } + + public QueueMetricsTestcase build() { + this.customResourceValues = extractCustomResources(resource); + return new QueueMetricsTestcase(this); + } + } + + private static final String CUSTOM_RES_1 = "custom_res_1"; + private static final String CUSTOM_RES_2 = "custom_res_2"; + private final Map customResourceValues; + private final int containers; + private final Resource resourceToDecrease; + private final int containersToDecrease; + private final Resource resource; + private final String partition; + private final MultiQueueSetup mqs; + + private QueueMetricsTestcase(Builder builder) { + this.customResourceValues = builder.customResourceValues; + this.containers = builder.containers; + this.resourceToDecrease = builder.resourceToDecrease; + this.containersToDecrease = builder.containersToDecrease; + this.resource = builder.resource; + this.partition = builder.partition; + this.mqs = new MultiQueueSetup(builder.metricsSystem, + builder.queueHierarchy, builder.user); + } + + void testIncreasePendingResources() { + testIncreasePendingResourcesInternal(this.containers); + } + + void testIncreasePendingResourcesWithoutContainer() { + testIncreasePendingResourcesInternal(1); + } + + private void testIncreasePendingResourcesInternal(int containers) { + mqs.getLeafMetrics().incrPendingResources(partition, mqs.user, containers, + resource); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .gaugeInt(PENDING_CONTAINERS, containers) + .gaugeLong(PENDING_MB, containers * resource.getMemorySize()) + .gaugeInt(PENDING_V_CORES, containers * resource.getVirtualCores()); + assertAllMetrics(mqs, checker, MetricsForCustomResource.PENDING, + computeExpectedCustomResourceValues((k, v) -> v * containers)); + } + + public void testDecreasePendingResources() { + final int vCoresToDecrease = resourceToDecrease.getVirtualCores(); + final long memoryMBToDecrease = resourceToDecrease.getMemorySize(); + final int containersAfterDecrease = containers - containersToDecrease; + final int vcoresAfterDecrease = + (resource.getVirtualCores() * containers) + - (vCoresToDecrease * containersToDecrease); + final long memoryAfterDecrease = (resource.getMemorySize() * containers) + - (memoryMBToDecrease * containersToDecrease); + + mqs.getLeafMetrics().decrPendingResources(partition, mqs.user, + containersToDecrease, + ResourceTypesTestHelper.newResource(memoryMBToDecrease, + vCoresToDecrease, + extractCustomResourcesAsStrings(resourceToDecrease))); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .gaugeInt(PENDING_CONTAINERS, containersAfterDecrease) + .gaugeLong(PENDING_MB, memoryAfterDecrease) + .gaugeInt(PENDING_V_CORES, vcoresAfterDecrease) + .checkAgainst(mqs.getLeafQueueSource()); + + assertAllMetrics(mqs, checker, MetricsForCustomResource.PENDING, + computeExpectedCustomResourceValues((k, v) -> v * containers + - (resourceToDecrease.getResourceValue(k) * containersToDecrease))); + } + + public void testAllocateResources(boolean decreasePending) { + mqs.getLeafMetrics().allocateResources(partition, mqs.user, containers, + resource, decreasePending); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .gaugeInt(ALLOCATED_CONTAINERS, containers) + .counter(AGGREGATE_CONTAINERS_ALLOCATED, containers) + .gaugeLong(ALLOCATED_MB, containers * resource.getMemorySize()) + .gaugeInt(ALLOCATED_V_CORES, containers * resource.getVirtualCores()) + .gaugeInt(PENDING_CONTAINERS, 0) + .gaugeLong(PENDING_MB, 0) + .gaugeInt(PENDING_V_CORES, 0) + .checkAgainst(mqs.getLeafQueueSource()); + if (decreasePending) { + assertAllMetrics(mqs, checker, MetricsForCustomResource.PENDING, + computeExpectedCustomResourceValues((k, v) -> 0L)); + } + if (!customResourceValues.isEmpty()) { + assertAllMetrics(mqs, checker, MetricsForCustomResource.ALLOCATED, + computeExpectedCustomResourceValues((k, v) -> v * containers)); + } + } + + public void testAllocateResourcesWithoutContainer() { + mqs.getLeafMetrics().allocateResources(partition, mqs.user, resource); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .gaugeLong(ALLOCATED_MB, resource.getMemorySize()) + .gaugeInt(ALLOCATED_V_CORES, resource.getVirtualCores()) + .gaugeInt(PENDING_CONTAINERS, 1) + .gaugeLong(PENDING_MB, 0) + .gaugeInt(PENDING_V_CORES, 0) + .checkAgainst(mqs.getLeafQueueSource()); + assertAllMetrics(mqs, checker, MetricsForCustomResource.PENDING, + computeExpectedCustomResourceValues((k, v) -> 0L)); + assertAllMetrics(mqs, checker, MetricsForCustomResource.ALLOCATED, + computeExpectedCustomResourceValues((k, v) -> v)); + } + + public void testReleaseResourcesWithContainers() { + mqs.getLeafMetrics().releaseResources(partition, mqs.user, containers, + resource); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .counter(AGGREGATE_CONTAINERS_ALLOCATED, containers) + .counter(AGGREGATE_CONTAINERS_RELEASED, containers) + .checkAgainst(mqs.getLeafQueueSource()); + assertAllMetrics(mqs, checker, MetricsForCustomResource.ALLOCATED, + computeExpectedCustomResourceValues((k, v) -> 0L)); + } + + public void testUpdatePreemptedSeconds(int seconds) { + mqs.getLeafMetrics() + .updatePreemptedMemoryMBSeconds(resource.getMemorySize() * seconds); + mqs.getLeafMetrics() + .updatePreemptedVcoreSeconds(resource.getVirtualCores() * seconds); + mqs.getLeafMetrics().updatePreemptedSecondsForCustomResources( + resource, seconds); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .counter(AGGREGATE_MEMORY_MB_SECONDS_PREEMPTED, + resource.getMemorySize() * seconds) + .counter(AGGREGATE_VCORE_SECONDS_PREEMPTED, + resource.getVirtualCores() * seconds); + + assertQueueMetricsOnly(mqs, checker, + MetricsForCustomResource.AGGREGATE_PREEMPTED_SECONDS, + computeExpectedCustomResourceValues((k, v) -> v * seconds)); + } + + public void testReserveResources() { + mqs.getLeafMetrics().reserveResource(partition, mqs.user, resource); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .gaugeInt(RESERVED_CONTAINERS, 1) + .gaugeLong(RESERVED_MB, resource.getMemorySize()) + .gaugeInt(RESERVED_V_CORES, resource.getVirtualCores()) + .checkAgainst(mqs.getLeafQueueSource()); + assertAllMetrics(mqs, checker, MetricsForCustomResource.RESERVED, + computeExpectedCustomResourceValues((k, v) -> v)); + } + + public void testUnreserveResources() { + mqs.getLeafMetrics().unreserveResource(partition, mqs.user, resource); + + ResourceMetricsChecker checker = ResourceMetricsChecker + .create() + .gaugeInt(RESERVED_CONTAINERS, 0) + .gaugeLong(RESERVED_MB, 0) + .gaugeInt(RESERVED_V_CORES, 0) + .checkAgainst(mqs.getLeafQueueSource()); + assertAllMetrics(mqs, checker, MetricsForCustomResource.RESERVED, + computeExpectedCustomResourceValues((k, v) -> 0L)); + } + + public void testGetAllocatedResources() { + testAllocateResources(false); + + Resource res = mqs.getLeafMetrics().getAllocatedResources(); + if (customResourceValues.size() > 0) { + assertCustomResourceValueInternal( + MetricsForCustomResource.ALLOCATED, + CUSTOM_RES_1, customResourceValues.get(CUSTOM_RES_1) * containers, + res.getResourceValue(CUSTOM_RES_1)); + assertCustomResourceValueInternal( + MetricsForCustomResource.ALLOCATED, + CUSTOM_RES_2, customResourceValues.get(CUSTOM_RES_2) * containers, + res.getResourceValue(CUSTOM_RES_2)); + } + } + + private void assertAllMetrics(MultiQueueSetup mqs, + ResourceMetricsChecker checker, + MetricsForCustomResource metricsType, + Map expectedCustomResourceValues) { + assertMetricsInternal(mqs, checker, metricsType, + QueueMetricsAssertionType.ALL, + UserMetricsAssertionType.ALL, + expectedCustomResourceValues); + } + + private void assertQueueMetricsOnly(MultiQueueSetup mqs, + ResourceMetricsChecker checker, + MetricsForCustomResource metricsType, + Map expectedCustomResourceValues) { + assertMetricsInternal(mqs, checker, metricsType, + QueueMetricsAssertionType.ALL, + UserMetricsAssertionType.NONE, expectedCustomResourceValues); + } + + private void assertMetricsInternal(MultiQueueSetup mqs, + ResourceMetricsChecker checker, MetricsForCustomResource metricsType, + QueueMetricsAssertionType queueAssertionType, + UserMetricsAssertionType userAssertionType, + Map expectedCustomResourceValues) { + if (queueAssertionType == QueueMetricsAssertionType.ALL) { + assertAllQueueMetrics(mqs, checker, metricsType, + expectedCustomResourceValues); + } else if (queueAssertionType == QueueMetricsAssertionType.ROOT_ONLY) { + checker = ResourceMetricsChecker.createFromChecker(checker) + .checkAgainst(mqs.getRootQueueSource()); + } + + if (userAssertionType == UserMetricsAssertionType.ALL) { + checker = ResourceMetricsChecker.createFromChecker(checker) + .checkAgainst(mqs.getLeafUserSource()); + ResourceMetricsChecker.createFromChecker(checker) + .checkAgainst(mqs.getRootUserSource()); + } + } + + private void assertAllQueueMetrics(MultiQueueSetup mqs, + ResourceMetricsChecker checker, MetricsForCustomResource metricsType, + Map expectedCustomResourceValues) { + //assert normal resource metrics values + List queueSources = mqs.getQueueSources(); + for (MetricsSource queueSource : queueSources) { + ResourceMetricsChecker.createFromChecker(checker) + .checkAgainst(queueSource); + } + + //assert custom resource metrics values + List queueMetrics = mqs.getQueueMetrics(); + for (QueueMetrics metrics : queueMetrics) { + assertCustomResourceValue(metrics, metricsType, CUSTOM_RES_1, + expectedCustomResourceValues.get(CUSTOM_RES_1)); + assertCustomResourceValue(metrics, metricsType, CUSTOM_RES_2, + expectedCustomResourceValues.get(CUSTOM_RES_2)); + } + } + + private Map computeExpectedCustomResourceValues( + BiFunction func) { + Map values = Maps.newHashMap(); + for (Map.Entry res : customResourceValues.entrySet()) { + values.put(res.getKey(), func.apply(res.getKey(), res.getValue())); + } + return values; + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceMetricsChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceMetricsChecker.java index cd617d7b9d0..05341aab10e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceMetricsChecker.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceMetricsChecker.java @@ -27,34 +27,31 @@ import static org.apache.hadoop.test.MetricsAsserts.assertCounter; import static org.apache.hadoop.test.MetricsAsserts.assertGauge; import static org.apache.hadoop.test.MetricsAsserts.getMetrics; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_CONTAINERS_ALLOCATED; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_CONTAINERS_RELEASED; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_CONTAINERS; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_MB; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_V_CORES; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.AVAILABLE_MB; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.AVAILABLE_V_CORES; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.PENDING_CONTAINERS; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricType.COUNTER_LONG; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricType.GAUGE_INT; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricType.GAUGE_LONG; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_CONTAINERS_ALLOCATED; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AGGREGATE_CONTAINERS_RELEASED; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_CONTAINERS; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.ALLOCATED_V_CORES; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AVAILABLE_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AVAILABLE_V_CORES; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.PENDING_CONTAINERS; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.PENDING_MB; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.PENDING_V_CORES; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.RESERVED_CONTAINERS; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler - .ResourceMetricsChecker.ResourceMetricsKey.RESERVED_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.RESERVED_CONTAINERS; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.RESERVED_MB; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.RESERVED_V_CORES; final class ResourceMetricsChecker { private final static Logger LOG = LoggerFactory.getLogger(ResourceMetricsChecker.class); + enum ResourceMetricType { + GAUGE_INT, GAUGE_LONG, COUNTER_INT, COUNTER_LONG + } + private static final ResourceMetricsChecker INITIAL_CHECKER = new ResourceMetricsChecker() .gaugeLong(ALLOCATED_MB, 0) @@ -72,29 +69,41 @@ .gaugeInt(RESERVED_CONTAINERS, 0); enum ResourceMetricsKey { - ALLOCATED_MB("AllocatedMB"), - ALLOCATED_V_CORES("AllocatedVCores"), - ALLOCATED_CONTAINERS("AllocatedContainers"), - AGGREGATE_CONTAINERS_ALLOCATED("AggregateContainersAllocated"), - AGGREGATE_CONTAINERS_RELEASED("AggregateContainersReleased"), - AVAILABLE_MB("AvailableMB"), - AVAILABLE_V_CORES("AvailableVCores"), - PENDING_MB("PendingMB"), - PENDING_V_CORES("PendingVCores"), - PENDING_CONTAINERS("PendingContainers"), - RESERVED_MB("ReservedMB"), - RESERVED_V_CORES("ReservedVCores"), - RESERVED_CONTAINERS("ReservedContainers"); + ALLOCATED_MB("AllocatedMB", GAUGE_LONG), + ALLOCATED_V_CORES("AllocatedVCores", GAUGE_INT), + ALLOCATED_CONTAINERS("AllocatedContainers", GAUGE_INT), + AGGREGATE_CONTAINERS_ALLOCATED("AggregateContainersAllocated", + COUNTER_LONG), + AGGREGATE_CONTAINERS_RELEASED("AggregateContainersReleased", + COUNTER_LONG), + AVAILABLE_MB("AvailableMB", GAUGE_LONG), + AVAILABLE_V_CORES("AvailableVCores", GAUGE_INT), + PENDING_MB("PendingMB", GAUGE_LONG), + PENDING_V_CORES("PendingVCores", GAUGE_INT), + PENDING_CONTAINERS("PendingContainers", GAUGE_INT), + RESERVED_MB("ReservedMB", GAUGE_LONG), + RESERVED_V_CORES("ReservedVCores", GAUGE_INT), + RESERVED_CONTAINERS("ReservedContainers", GAUGE_INT), + AGGREGATE_VCORE_SECONDS_PREEMPTED( + "AggregateVcoreSecondsPreempted", COUNTER_LONG), + AGGREGATE_MEMORY_MB_SECONDS_PREEMPTED( + "AggregateMemoryMBSecondsPreempted", COUNTER_LONG); private String value; + private ResourceMetricType type; - ResourceMetricsKey(String value) { + ResourceMetricsKey(String value, ResourceMetricType type) { this.value = value; + this.type = type; } public String getValue() { return value; } + + public ResourceMetricType getType() { + return type; + } } private final Map gaugesLong; @@ -123,20 +132,31 @@ public static ResourceMetricsChecker create() { } ResourceMetricsChecker gaugeLong(ResourceMetricsKey key, long value) { + ensureTypeIsCorrect(key, GAUGE_LONG); gaugesLong.put(key, value); return this; } ResourceMetricsChecker gaugeInt(ResourceMetricsKey key, int value) { + ensureTypeIsCorrect(key, GAUGE_INT); gaugesInt.put(key, value); return this; } ResourceMetricsChecker counter(ResourceMetricsKey key, long value) { + ensureTypeIsCorrect(key, COUNTER_LONG); counters.put(key, value); return this; } + private void ensureTypeIsCorrect(ResourceMetricsKey + key, ResourceMetricType actualType) { + if (key.type != actualType) { + throw new IllegalStateException("Metrics type should be " + key.type + + " instead of " + actualType + " for metrics: " + key.value); + } + } + ResourceMetricsChecker checkAgainst(MetricsSource source) { if (source == null) { throw new IllegalStateException("MetricsSource should not be null!"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java index c971d655e59..6daf3b42551 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.MetricsSource; @@ -46,8 +47,88 @@ import org.junit.Before; import org.junit.Test; +import java.util.List; + public class TestQueueMetrics { + static class MultiQueueSetup { + private List queueMetrics = Lists.newArrayList(); + private List queueSources = Lists.newArrayList(); + private List userSources = Lists.newArrayList(); + + final String user; + + MultiQueueSetup(MetricsSystem ms, QueueHierarchy queueHierarchy, + String user) { + this.user = user; + init(ms, queueHierarchy); + + getLeafMetrics().submitApp(user); + + for (int i = 0; i < queueHierarchy.size(); i++) { + String queue = queueHierarchy.queueAtLevel(i); + userSources.add(userSource(ms, queue, user)); + } + + } + + private void init(MetricsSystem ms, QueueHierarchy queueHierarchy) { + for (int i = 0; i < queueHierarchy.size(); i++) { + final String queueName = queueHierarchy.queueAtLevel(i); + //root queue + if (i == 0) { + queueMetrics.add(QueueMetrics.forQueue(ms, queueName, null, + true, conf)); + } else { + Queue parentQueue = createMockQueue(queueMetrics.get(i - 1)); + queueMetrics.add( + QueueMetrics.forQueue(ms, queueName, parentQueue, true, conf)); + } + queueSources.add(queueSource(ms, queueName)); + } + } + + QueueMetrics getRootMetrics() { + return queueMetrics.get(0); + } + + QueueMetrics getLeafMetrics() { + return queueMetrics.get(queueMetrics.size() - 1); + } + + List getQueueMetrics() { + return queueMetrics; + } + + MetricsSource getRootQueueSource() { + return queueSources.get(0); + } + + MetricsSource getLeafQueueSource() { + return queueSources.get(queueSources.size() - 1); + } + + MetricsSource getRootUserSource() { + return userSources.get(0); + } + + MetricsSource getLeafUserSource() { + return userSources.get(userSources.size() - 1); + } + + List getQueueSources() { + return queueSources; + } + } + + private static Queue createMockQueue(QueueMetrics metrics) { + Queue queue = mock(Queue.class); + when(queue.getMetrics()).thenReturn(metrics); + return queue; + } + private static final int GB = 1024; // MB + private static final String USER = "alice"; + private static final String USER_2 = "dodo"; private static final Configuration conf = new Configuration(); private MetricsSystem ms; @@ -60,19 +141,18 @@ public void setUp() { @Test public void testDefaultSingleQueueMetrics() { String queueName = "single"; - String user = "alice"; QueueMetrics metrics = QueueMetrics.forQueue(ms, queueName, null, false, conf); MetricsSource queueSource= queueSource(ms, queueName); - AppSchedulingInfo app = mockApp(user); + AppSchedulingInfo app = mockApp(USER); - metrics.submitApp(user); - MetricsSource userSource = userSource(ms, queueName, user); + metrics.submitApp(USER); + MetricsSource userSource = userSource(ms, queueName, USER); AppMetricsChecker appMetricsChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) .checkAgainst(queueSource, true); - metrics.submitAppAttempt(user); + metrics.submitAppAttempt(USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 1) .checkAgainst(queueSource, true); @@ -80,7 +160,7 @@ public void testDefaultSingleQueueMetrics() { metrics.setAvailableResourcesToQueue(RMNodeLabelsManager.NO_LABEL, Resources.createResource(100*GB, 100)); metrics.incrPendingResources(RMNodeLabelsManager.NO_LABEL, - user, 5, Resources.createResource(3*GB, 3)); + USER, 5, Resources.createResource(3*GB, 3)); // Available resources is set externally, as it depends on dynamic // configurable cluster/queue resources ResourceMetricsChecker rmChecker = ResourceMetricsChecker.create() @@ -91,14 +171,14 @@ public void testDefaultSingleQueueMetrics() { .gaugeInt(PENDING_CONTAINERS, 5) .checkAgainst(queueSource); - metrics.runAppAttempt(app.getApplicationId(), user); + metrics.runAppAttempt(app.getApplicationId(), USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 1) .checkAgainst(queueSource, true); metrics.allocateResources(RMNodeLabelsManager.NO_LABEL, - user, 3, Resources.createResource(2*GB, 2), true); + USER, 3, Resources.createResource(2*GB, 2), true); rmChecker = ResourceMetricsChecker.createFromChecker(rmChecker) .gaugeLong(ALLOCATED_MB, 6 * GB) .gaugeInt(ALLOCATED_V_CORES, 6) @@ -110,7 +190,7 @@ public void testDefaultSingleQueueMetrics() { .checkAgainst(queueSource); metrics.releaseResources(RMNodeLabelsManager.NO_LABEL, - user, 1, Resources.createResource(2*GB, 2)); + USER, 1, Resources.createResource(2*GB, 2)); rmChecker = ResourceMetricsChecker.createFromChecker(rmChecker) .gaugeLong(ALLOCATED_MB, 4 * GB) .gaugeInt(ALLOCATED_V_CORES, 4) @@ -119,13 +199,13 @@ public void testDefaultSingleQueueMetrics() { .checkAgainst(queueSource); metrics.incrPendingResources(RMNodeLabelsManager.NO_LABEL, - user, 0, Resources.createResource(2 * GB, 2)); + USER, 0, Resources.createResource(2 * GB, 2)); //nothing should change in values rmChecker = ResourceMetricsChecker.createFromChecker(rmChecker) .checkAgainst(queueSource); metrics.decrPendingResources(RMNodeLabelsManager.NO_LABEL, - user, 0, Resources.createResource(2 * GB, 2)); + USER, 0, Resources.createResource(2 * GB, 2)); //nothing should change in values ResourceMetricsChecker.createFromChecker(rmChecker) .checkAgainst(queueSource); @@ -136,7 +216,7 @@ public void testDefaultSingleQueueMetrics() { .counter(APPS_SUBMITTED, 1) .gaugeInt(APPS_RUNNING, 0) .checkAgainst(queueSource, true); - metrics.finishApp(user, RMAppState.FINISHED); + metrics.finishApp(USER, RMAppState.FINISHED); AppMetricsChecker.createFromChecker(appMetricsChecker) .counter(APPS_COMPLETED, 1) .checkAgainst(queueSource, true); @@ -146,24 +226,23 @@ public void testDefaultSingleQueueMetrics() { @Test public void testQueueAppMetricsForMultipleFailures() { String queueName = "single"; - String user = "alice"; QueueMetrics metrics = QueueMetrics.forQueue(ms, queueName, null, false, new Configuration()); MetricsSource queueSource = queueSource(ms, queueName); - AppSchedulingInfo app = mockApp(user); + AppSchedulingInfo app = mockApp(USER); - metrics.submitApp(user); - MetricsSource userSource = userSource(ms, queueName, user); + metrics.submitApp(USER); + MetricsSource userSource = userSource(ms, queueName, USER); AppMetricsChecker appMetricsChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) .checkAgainst(queueSource, true); - metrics.submitAppAttempt(user); + metrics.submitAppAttempt(USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 1) .checkAgainst(queueSource, true); - metrics.runAppAttempt(app.getApplicationId(), user); + metrics.runAppAttempt(app.getApplicationId(), USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 1) @@ -177,12 +256,12 @@ public void testQueueAppMetricsForMultipleFailures() { // As the application has failed, framework retries the same application // based on configuration - metrics.submitAppAttempt(user); + metrics.submitAppAttempt(USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 1) .checkAgainst(queueSource, true); - metrics.runAppAttempt(app.getApplicationId(), user); + metrics.runAppAttempt(app.getApplicationId(), USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 1) @@ -197,12 +276,12 @@ public void testQueueAppMetricsForMultipleFailures() { // As the application has failed, framework retries the same application // based on configuration - metrics.submitAppAttempt(user); + metrics.submitAppAttempt(USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 1) .checkAgainst(queueSource, true); - metrics.runAppAttempt(app.getApplicationId(), user); + metrics.runAppAttempt(app.getApplicationId(), USER); appMetricsChecker = AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 1) @@ -215,7 +294,7 @@ public void testQueueAppMetricsForMultipleFailures() { .gaugeInt(APPS_RUNNING, 0) .checkAgainst(queueSource, true); - metrics.finishApp(user, RMAppState.FAILED); + metrics.finishApp(USER, RMAppState.FAILED); AppMetricsChecker.createFromChecker(appMetricsChecker) .gaugeInt(APPS_RUNNING, 0) .counter(APPS_FAILED, 1) @@ -227,15 +306,14 @@ public void testQueueAppMetricsForMultipleFailures() { @Test public void testSingleQueueWithUserMetrics() { String queueName = "single2"; - String user = "dodo"; QueueMetrics metrics = QueueMetrics.forQueue(ms, queueName, null, true, conf); MetricsSource queueSource = queueSource(ms, queueName); - AppSchedulingInfo app = mockApp(user); + AppSchedulingInfo app = mockApp(USER_2); - metrics.submitApp(user); - MetricsSource userSource = userSource(ms, queueName, user); + metrics.submitApp(USER_2); + MetricsSource userSource = userSource(ms, queueName, USER_2); AppMetricsChecker appMetricsQueueSourceChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) @@ -244,7 +322,7 @@ public void testSingleQueueWithUserMetrics() { .counter(APPS_SUBMITTED, 1) .checkAgainst(userSource, true); - metrics.submitAppAttempt(user); + metrics.submitAppAttempt(USER_2); appMetricsQueueSourceChecker = AppMetricsChecker .createFromChecker(appMetricsQueueSourceChecker) .gaugeInt(APPS_PENDING, 1) @@ -257,9 +335,9 @@ public void testSingleQueueWithUserMetrics() { metrics.setAvailableResourcesToQueue(RMNodeLabelsManager.NO_LABEL, Resources.createResource(100*GB, 100)); metrics.setAvailableResourcesToUser(RMNodeLabelsManager.NO_LABEL, - user, Resources.createResource(10*GB, 10)); + USER_2, Resources.createResource(10*GB, 10)); metrics.incrPendingResources(RMNodeLabelsManager.NO_LABEL, - user, 5, Resources.createResource(3*GB, 3)); + USER_2, 5, Resources.createResource(3*GB, 3)); // Available resources is set externally, as it depends on dynamic // configurable cluster/queue resources @@ -280,7 +358,7 @@ public void testSingleQueueWithUserMetrics() { .gaugeInt(PENDING_CONTAINERS, 5) .checkAgainst(userSource); - metrics.runAppAttempt(app.getApplicationId(), user); + metrics.runAppAttempt(app.getApplicationId(), USER_2); appMetricsQueueSourceChecker = AppMetricsChecker .createFromChecker(appMetricsQueueSourceChecker) .gaugeInt(APPS_PENDING, 0) @@ -293,7 +371,7 @@ public void testSingleQueueWithUserMetrics() { .checkAgainst(userSource, true); metrics.allocateResources(RMNodeLabelsManager.NO_LABEL, - user, 3, Resources.createResource(2*GB, 2), true); + USER_2, 3, Resources.createResource(2*GB, 2), true); resMetricsQueueSourceChecker = ResourceMetricsChecker.createFromChecker(resMetricsQueueSourceChecker) .gaugeLong(ALLOCATED_MB, 6 * GB) @@ -316,7 +394,7 @@ public void testSingleQueueWithUserMetrics() { .checkAgainst(userSource); metrics.releaseResources(RMNodeLabelsManager.NO_LABEL, - user, 1, Resources.createResource(2*GB, 2)); + USER_2, 1, Resources.createResource(2*GB, 2)); ResourceMetricsChecker.createFromChecker(resMetricsQueueSourceChecker) .gaugeLong(ALLOCATED_MB, 4 * GB) .gaugeInt(ALLOCATED_V_CORES, 4) @@ -340,7 +418,7 @@ public void testSingleQueueWithUserMetrics() { AppMetricsChecker.createFromChecker(appMetricsUserSourceChecker) .gaugeInt(APPS_RUNNING, 0) .checkAgainst(userSource, true); - metrics.finishApp(user, RMAppState.FINISHED); + metrics.finishApp(USER_2, RMAppState.FINISHED); AppMetricsChecker.createFromChecker(appMetricsQueueSourceChecker) .counter(APPS_COMPLETED, 1) .checkAgainst(queueSource, true); @@ -353,7 +431,6 @@ public void testSingleQueueWithUserMetrics() { public void testNodeTypeMetrics() { String parentQueueName = "root"; String leafQueueName = "root.leaf"; - String user = "alice"; QueueMetrics parentMetrics = QueueMetrics.forQueue(ms, parentQueueName, null, true, conf); @@ -365,29 +442,29 @@ public void testNodeTypeMetrics() { MetricsSource queueSource = queueSource(ms, leafQueueName); //AppSchedulingInfo app = mockApp(user); - metrics.submitApp(user); - MetricsSource userSource = userSource(ms, leafQueueName, user); - MetricsSource parentUserSource = userSource(ms, parentQueueName, user); + metrics.submitApp(USER); + MetricsSource userSource = userSource(ms, leafQueueName, USER); + MetricsSource parentUserSource = userSource(ms, parentQueueName, USER); - metrics.incrNodeTypeAggregations(user, NodeType.NODE_LOCAL); + metrics.incrNodeTypeAggregations(USER, NodeType.NODE_LOCAL); checkAggregatedNodeTypes(queueSource, 1L, 0L, 0L); checkAggregatedNodeTypes(parentQueueSource, 1L, 0L, 0L); checkAggregatedNodeTypes(userSource, 1L, 0L, 0L); checkAggregatedNodeTypes(parentUserSource, 1L, 0L, 0L); - metrics.incrNodeTypeAggregations(user, NodeType.RACK_LOCAL); + metrics.incrNodeTypeAggregations(USER, NodeType.RACK_LOCAL); checkAggregatedNodeTypes(queueSource, 1L, 1L, 0L); checkAggregatedNodeTypes(parentQueueSource, 1L, 1L, 0L); checkAggregatedNodeTypes(userSource, 1L, 1L, 0L); checkAggregatedNodeTypes(parentUserSource, 1L, 1L, 0L); - metrics.incrNodeTypeAggregations(user, NodeType.OFF_SWITCH); + metrics.incrNodeTypeAggregations(USER, NodeType.OFF_SWITCH); checkAggregatedNodeTypes(queueSource, 1L, 1L, 1L); checkAggregatedNodeTypes(parentQueueSource, 1L, 1L, 1L); checkAggregatedNodeTypes(userSource, 1L, 1L, 1L); checkAggregatedNodeTypes(parentUserSource, 1L, 1L, 1L); - metrics.incrNodeTypeAggregations(user, NodeType.OFF_SWITCH); + metrics.incrNodeTypeAggregations(USER, NodeType.OFF_SWITCH); checkAggregatedNodeTypes(queueSource, 1L, 1L, 2L); checkAggregatedNodeTypes(parentQueueSource, 1L, 1L, 2L); checkAggregatedNodeTypes(userSource, 1L, 1L, 2L); @@ -396,67 +473,59 @@ public void testNodeTypeMetrics() { @Test public void testTwoLevelWithUserMetrics() { - String parentQueueName = "root"; - String leafQueueName = "root.leaf"; - String user = "alice"; + AppSchedulingInfo app = mockApp(USER); - QueueMetrics parentMetrics = - QueueMetrics.forQueue(ms, parentQueueName, null, true, conf); - Queue parentQueue = mock(Queue.class); - when(parentQueue.getMetrics()).thenReturn(parentMetrics); - QueueMetrics metrics = - QueueMetrics.forQueue(ms, leafQueueName, parentQueue, true, conf); - MetricsSource parentQueueSource = queueSource(ms, parentQueueName); - MetricsSource queueSource = queueSource(ms, leafQueueName); - AppSchedulingInfo app = mockApp(user); - - metrics.submitApp(user); - MetricsSource userSource = userSource(ms, leafQueueName, user); - MetricsSource parentUserSource = userSource(ms, parentQueueName, user); + MultiQueueSetup mqs = new MultiQueueSetup(ms, + QueueHierarchy.create("root", "root.leaf"), USER); AppMetricsChecker appMetricsQueueSourceChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) - .checkAgainst(queueSource, true); + .checkAgainst(mqs.getLeafQueueSource(), true); AppMetricsChecker appMetricsParentQueueSourceChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) - .checkAgainst(parentQueueSource, true); + .checkAgainst(mqs.getRootQueueSource(), true); AppMetricsChecker appMetricsUserSourceChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) - .checkAgainst(userSource, true); + .checkAgainst(mqs.getLeafUserSource(), true); AppMetricsChecker appMetricsParentUserSourceChecker = AppMetricsChecker.create() .counter(APPS_SUBMITTED, 1) - .checkAgainst(parentUserSource, true); + .checkAgainst(mqs.getRootUserSource(), true); - metrics.submitAppAttempt(user); + mqs.getLeafMetrics().submitAppAttempt(USER); appMetricsQueueSourceChecker = AppMetricsChecker.createFromChecker(appMetricsQueueSourceChecker) .gaugeInt(APPS_PENDING, 1) - .checkAgainst(queueSource, true); + .checkAgainst(mqs.getLeafQueueSource(), true); appMetricsParentQueueSourceChecker = AppMetricsChecker.createFromChecker(appMetricsParentQueueSourceChecker) .gaugeInt(APPS_PENDING, 1) - .checkAgainst(parentQueueSource, true); + .checkAgainst(mqs.getRootQueueSource(), true); appMetricsUserSourceChecker = AppMetricsChecker.createFromChecker(appMetricsUserSourceChecker) .gaugeInt(APPS_PENDING, 1) - .checkAgainst(userSource, true); + .checkAgainst(mqs.getLeafUserSource(), true); appMetricsParentUserSourceChecker = AppMetricsChecker.createFromChecker(appMetricsParentUserSourceChecker) .gaugeInt(APPS_PENDING, 1) - .checkAgainst(parentUserSource, true); + .checkAgainst(mqs.getRootUserSource(), true); - parentMetrics.setAvailableResourcesToQueue(RMNodeLabelsManager.NO_LABEL, + mqs.getRootMetrics().setAvailableResourcesToQueue( + RMNodeLabelsManager.NO_LABEL, Resources.createResource(100*GB, 100)); - metrics.setAvailableResourcesToQueue(RMNodeLabelsManager.NO_LABEL, + mqs.getLeafMetrics().setAvailableResourcesToQueue( + RMNodeLabelsManager.NO_LABEL, Resources.createResource(100*GB, 100)); - parentMetrics.setAvailableResourcesToUser(RMNodeLabelsManager.NO_LABEL, - user, Resources.createResource(10*GB, 10)); - metrics.setAvailableResourcesToUser(RMNodeLabelsManager.NO_LABEL, - user, Resources.createResource(10*GB, 10)); - metrics.incrPendingResources(RMNodeLabelsManager.NO_LABEL, - user, 5, Resources.createResource(3*GB, 3)); + mqs.getRootMetrics().setAvailableResourcesToUser( + RMNodeLabelsManager.NO_LABEL, + USER, Resources.createResource(10*GB, 10)); + mqs.getLeafMetrics().setAvailableResourcesToUser( + RMNodeLabelsManager.NO_LABEL, + USER, Resources.createResource(10*GB, 10)); + mqs.getLeafMetrics().incrPendingResources( + RMNodeLabelsManager.NO_LABEL, + USER, 5, Resources.createResource(3*GB, 3)); ResourceMetricsChecker resMetricsQueueSourceChecker = ResourceMetricsChecker.create() @@ -465,7 +534,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(PENDING_MB, 15 * GB) .gaugeInt(PENDING_V_CORES, 15) .gaugeInt(PENDING_CONTAINERS, 5) - .checkAgainst(queueSource); + .checkAgainst(mqs.getLeafQueueSource()); ResourceMetricsChecker resMetricsParentQueueSourceChecker = ResourceMetricsChecker.create() .gaugeLong(AVAILABLE_MB, 100 * GB) @@ -473,7 +542,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(PENDING_MB, 15 * GB) .gaugeInt(PENDING_V_CORES, 15) .gaugeInt(PENDING_CONTAINERS, 5) - .checkAgainst(parentQueueSource); + .checkAgainst(mqs.getRootQueueSource()); ResourceMetricsChecker resMetricsUserSourceChecker = ResourceMetricsChecker.create() .gaugeLong(AVAILABLE_MB, 10 * GB) @@ -481,7 +550,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(PENDING_MB, 15 * GB) .gaugeInt(PENDING_V_CORES, 15) .gaugeInt(PENDING_CONTAINERS, 5) - .checkAgainst(userSource); + .checkAgainst(mqs.getLeafUserSource()); ResourceMetricsChecker resMetricsParentUserSourceChecker = ResourceMetricsChecker.create() .gaugeLong(AVAILABLE_MB, 10 * GB) @@ -489,24 +558,24 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(PENDING_MB, 15 * GB) .gaugeInt(PENDING_V_CORES, 15) .gaugeInt(PENDING_CONTAINERS, 5) - .checkAgainst(parentUserSource); + .checkAgainst(mqs.getRootUserSource()); - metrics.runAppAttempt(app.getApplicationId(), user); + mqs.getLeafMetrics().runAppAttempt(app.getApplicationId(), USER); appMetricsQueueSourceChecker = AppMetricsChecker.createFromChecker(appMetricsQueueSourceChecker) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 1) - .checkAgainst(queueSource, true); + .checkAgainst(mqs.getLeafQueueSource(), true); appMetricsUserSourceChecker = AppMetricsChecker.createFromChecker(appMetricsUserSourceChecker) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 1) - .checkAgainst(userSource, true); + .checkAgainst(mqs.getLeafUserSource(), true); - metrics.allocateResources(RMNodeLabelsManager.NO_LABEL, - user, 3, Resources.createResource(2*GB, 2), true); - metrics.reserveResource(RMNodeLabelsManager.NO_LABEL, - user, Resources.createResource(3*GB, 3)); + mqs.getLeafMetrics().allocateResources(RMNodeLabelsManager.NO_LABEL, + USER, 3, Resources.createResource(2*GB, 2), true); + mqs.getLeafMetrics().reserveResource(RMNodeLabelsManager.NO_LABEL, + USER, Resources.createResource(3*GB, 3)); // Available resources is set externally, as it depends on dynamic // configurable cluster/queue resources resMetricsQueueSourceChecker = @@ -521,7 +590,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 3 * GB) .gaugeInt(RESERVED_V_CORES, 3) .gaugeInt(RESERVED_CONTAINERS, 1) - .checkAgainst(queueSource); + .checkAgainst(mqs.getLeafQueueSource()); resMetricsParentQueueSourceChecker = ResourceMetricsChecker .createFromChecker(resMetricsParentQueueSourceChecker) @@ -535,7 +604,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 3 * GB) .gaugeInt(RESERVED_V_CORES, 3) .gaugeInt(RESERVED_CONTAINERS, 1) - .checkAgainst(parentQueueSource); + .checkAgainst(mqs.getRootQueueSource()); resMetricsUserSourceChecker = ResourceMetricsChecker.createFromChecker(resMetricsUserSourceChecker) .gaugeLong(ALLOCATED_MB, 6 * GB) @@ -548,7 +617,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 3 * GB) .gaugeInt(RESERVED_V_CORES, 3) .gaugeInt(RESERVED_CONTAINERS, 1) - .checkAgainst(userSource); + .checkAgainst(mqs.getLeafUserSource()); resMetricsParentUserSourceChecker = ResourceMetricsChecker .createFromChecker(resMetricsParentUserSourceChecker) .gaugeLong(ALLOCATED_MB, 6 * GB) @@ -561,12 +630,12 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 3 * GB) .gaugeInt(RESERVED_V_CORES, 3) .gaugeInt(RESERVED_CONTAINERS, 1) - .checkAgainst(parentUserSource); + .checkAgainst(mqs.getRootUserSource()); - metrics.releaseResources(RMNodeLabelsManager.NO_LABEL, - user, 1, Resources.createResource(2*GB, 2)); - metrics.unreserveResource(RMNodeLabelsManager.NO_LABEL, - user, Resources.createResource(3*GB, 3)); + mqs.getLeafMetrics().releaseResources(RMNodeLabelsManager.NO_LABEL, + USER, 1, Resources.createResource(2*GB, 2)); + mqs.getLeafMetrics().unreserveResource(RMNodeLabelsManager.NO_LABEL, + USER, Resources.createResource(3*GB, 3)); ResourceMetricsChecker.createFromChecker(resMetricsQueueSourceChecker) .gaugeLong(ALLOCATED_MB, 4 * GB) .gaugeInt(ALLOCATED_V_CORES, 4) @@ -575,7 +644,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 0) .gaugeInt(RESERVED_V_CORES, 0) .gaugeInt(RESERVED_CONTAINERS, 0) - .checkAgainst(queueSource); + .checkAgainst(mqs.getLeafQueueSource()); ResourceMetricsChecker.createFromChecker(resMetricsParentQueueSourceChecker) .gaugeLong(ALLOCATED_MB, 4 * GB) .gaugeInt(ALLOCATED_V_CORES, 4) @@ -584,7 +653,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 0) .gaugeInt(RESERVED_V_CORES, 0) .gaugeInt(RESERVED_CONTAINERS, 0) - .checkAgainst(parentQueueSource); + .checkAgainst(mqs.getRootQueueSource()); ResourceMetricsChecker.createFromChecker(resMetricsUserSourceChecker) .gaugeLong(ALLOCATED_MB, 4 * GB) .gaugeInt(ALLOCATED_V_CORES, 4) @@ -593,7 +662,7 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 0) .gaugeInt(RESERVED_V_CORES, 0) .gaugeInt(RESERVED_CONTAINERS, 0) - .checkAgainst(userSource); + .checkAgainst(mqs.getLeafUserSource()); ResourceMetricsChecker.createFromChecker(resMetricsParentUserSourceChecker) .gaugeLong(ALLOCATED_MB, 4 * GB) .gaugeInt(ALLOCATED_V_CORES, 4) @@ -602,46 +671,46 @@ public void testTwoLevelWithUserMetrics() { .gaugeLong(RESERVED_MB, 0) .gaugeInt(RESERVED_V_CORES, 0) .gaugeInt(RESERVED_CONTAINERS, 0) - .checkAgainst(parentUserSource); + .checkAgainst(mqs.getRootUserSource()); - metrics.finishAppAttempt( + mqs.getLeafMetrics().finishAppAttempt( app.getApplicationId(), app.isPending(), app.getUser()); appMetricsQueueSourceChecker = AppMetricsChecker .createFromChecker(appMetricsQueueSourceChecker) .counter(APPS_SUBMITTED, 1) .gaugeInt(APPS_RUNNING, 0) - .checkAgainst(queueSource, true); + .checkAgainst(mqs.getLeafQueueSource(), true); appMetricsParentQueueSourceChecker = AppMetricsChecker .createFromChecker(appMetricsParentQueueSourceChecker) .counter(APPS_SUBMITTED, 1) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 0) - .checkAgainst(parentQueueSource, true); + .checkAgainst(mqs.getRootQueueSource(), true); appMetricsUserSourceChecker = AppMetricsChecker .createFromChecker(appMetricsUserSourceChecker) .counter(APPS_SUBMITTED, 1) .gaugeInt(APPS_RUNNING, 0) - .checkAgainst(userSource, true); + .checkAgainst(mqs.getLeafUserSource(), true); appMetricsParentUserSourceChecker = AppMetricsChecker .createFromChecker(appMetricsParentUserSourceChecker) .counter(APPS_SUBMITTED, 1) .gaugeInt(APPS_PENDING, 0) .gaugeInt(APPS_RUNNING, 0) - .checkAgainst(parentUserSource, true); + .checkAgainst(mqs.getRootUserSource(), true); - metrics.finishApp(user, RMAppState.FINISHED); + mqs.getLeafMetrics().finishApp(USER, RMAppState.FINISHED); AppMetricsChecker.createFromChecker(appMetricsQueueSourceChecker) .counter(APPS_COMPLETED, 1) - .checkAgainst(queueSource, true); + .checkAgainst(mqs.getLeafQueueSource(), true); AppMetricsChecker.createFromChecker(appMetricsParentQueueSourceChecker) .counter(APPS_COMPLETED, 1) - .checkAgainst(parentQueueSource, true); + .checkAgainst(mqs.getRootQueueSource(), true); AppMetricsChecker.createFromChecker(appMetricsUserSourceChecker) .counter(APPS_COMPLETED, 1) - .checkAgainst(userSource, true); + .checkAgainst(mqs.getLeafUserSource(), true); AppMetricsChecker.createFromChecker(appMetricsParentUserSourceChecker) .counter(APPS_COMPLETED, 1) - .checkAgainst(parentUserSource, true); + .checkAgainst(mqs.getRootUserSource(), true); } @Test @@ -719,7 +788,7 @@ private static void checkAggregatedNodeTypes(MetricsSource source, assertCounter("AggregateOffSwitchContainersAllocated", offSwitch, rb); } - private static AppSchedulingInfo mockApp(String user) { + static AppSchedulingInfo mockApp(String user) { AppSchedulingInfo app = mock(AppSchedulingInfo.class); when(app.getUser()).thenReturn(user); ApplicationId appId = BuilderUtils.newApplicationId(1, 1); @@ -732,7 +801,7 @@ public static MetricsSource queueSource(MetricsSystem ms, String queue) { return ms.getSource(QueueMetrics.sourceName(queue).toString()); } - private static MetricsSource userSource(MetricsSystem ms, String queue, + static MetricsSource userSource(MetricsSystem ms, String queue, String user) { return ms.getSource(QueueMetrics.sourceName(queue). append(",user=").append(user).toString()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetricsForCustomResources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetricsForCustomResources.java new file mode 100644 index 00000000000..4dc60a80aaa --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetricsForCustomResources.java @@ -0,0 +1,430 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.metrics2.MetricsSource; +import org.apache.hadoop.metrics2.MetricsSystem; +import org.apache.hadoop.metrics2.impl.MetricsSystemImpl; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.api.records.ResourceInformation; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; + +import org.apache.hadoop.yarn.server.resourcemanager.scheduler + .TestQueueMetrics.MultiQueueSetup; +import org.apache.hadoop.yarn.util.resource.ResourceUtils; +import org.junit.Before; +import org.junit.Test; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB; +import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES; + +import static org.apache.hadoop.yarn.resourcetypes.ResourceTypesTestHelper + .newResource; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AVAILABLE_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceMetricsChecker.ResourceMetricsKey.AVAILABLE_V_CORES; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.TestQueueMetrics.queueSource; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +public class TestQueueMetricsForCustomResources { + public enum MetricsForCustomResource { + ALLOCATED, AVAILABLE, PENDING, RESERVED, AGGREGATE_PREEMPTED_SECONDS + } + + public static final long GB = 1024; // MB + private static final Configuration conf = new Configuration(); + private static final String CUSTOM_RES_1 = "custom_res_1"; + private static final String CUSTOM_RES_2 = "custom_res_2"; + private static final String ROOT_QUEUE_NAME = "root"; + private static final String LEAF_QUEUE_NAME = "root.leaf"; + public static final String USER = "alice"; + private Resource defaultResource; + private MetricsSystem ms; + + static Map getMetricsByType( + QueueMetricsForCustomResources customResources, + MetricsForCustomResource metricsType) { + switch (metricsType) { + case AVAILABLE: + return customResources.getAvailable().values; + case ALLOCATED: + return customResources.getAllocatedValues(); + case PENDING: + return customResources.getPending().values; + case RESERVED: + return customResources.getReserved().values; + case AGGREGATE_PREEMPTED_SECONDS: + return customResources.getAggregatePreemptedSeconds().values; + default: + throw new IllegalStateException( + "No map found for metrics type: " + metricsType); + } + } + + @Before + public void setUp() { + ms = new MetricsSystemImpl(); + QueueMetrics.clearQueueMetrics(); + initializeResourceTypes(); + createDefaultResource(); + } + + private void createDefaultResource() { + defaultResource = newResource(4 * GB, 4, + ImmutableMap. builder() + .put(CUSTOM_RES_1, String.valueOf(15 * GB)) + .put(CUSTOM_RES_2, String.valueOf(20 * GB)) + .build()); + } + + private void initializeResourceTypes() { + Map riMap = new HashMap<>(); + + ResourceInformation memory = ResourceInformation.newInstance( + ResourceInformation.MEMORY_MB.getName(), + ResourceInformation.MEMORY_MB.getUnits(), + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB, + DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB); + ResourceInformation vcores = ResourceInformation.newInstance( + ResourceInformation.VCORES.getName(), + ResourceInformation.VCORES.getUnits(), + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES, + DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); + ResourceInformation res1 = ResourceInformation.newInstance(CUSTOM_RES_1, + ResourceInformation.VCORES.getUnits(), 0, 2000); + ResourceInformation res2 = ResourceInformation.newInstance(CUSTOM_RES_2, + ResourceInformation.VCORES.getUnits(), 0, 2000); + + riMap.put(ResourceInformation.MEMORY_URI, memory); + riMap.put(ResourceInformation.VCORES_URI, vcores); + riMap.put(CUSTOM_RES_1, res1); + riMap.put(CUSTOM_RES_2, res2); + ResourceUtils.initializeResourcesFromResourceInformationMap(riMap); + } + + static void assertCustomResourceValue(QueueMetrics metrics, + MetricsForCustomResource metricsType, String resourceName, + long expectedValue) { + Map metricsValues = + getMetricsByType(metrics.queueMetricsForCustomResources, metricsType); + Long value = metricsValues.get(resourceName); + assertCustomResourceValueInternal(metricsType, resourceName, + expectedValue, value); + } + + static void assertCustomResourceValueInternal( + MetricsForCustomResource metricsType, String resourceName, long + expectedValue, Long value) { + assertNotNull( + "QueueMetrics should have custom resource metrics value " + + "for resource: " + resourceName, value); + assertEquals(String.format( + "QueueMetrics should have custom resource metrics value %d " + + "for resource: %s for metrics type %s", + expectedValue, resourceName, metricsType), expectedValue, + (long) value); + } + + private static Map getCustomResourcesWithValue(long value) { + return ImmutableMap.builder() + .put(CUSTOM_RES_1, String.valueOf(value)) + .put(CUSTOM_RES_2, String.valueOf(value)) + .build(); + } + + private static QueueHierarchy createFourLevelQueueHierarchy() { + return QueueHierarchy.create("root", "root.subQueue") + .addChild("root.subQueue.subQueue2") + .addChild("root.subQueue.subQueue2.leafQueue"); + } + + private static QueueHierarchy createBasicQueueHierarchy() { + return QueueHierarchy.create(ROOT_QUEUE_NAME, LEAF_QUEUE_NAME); + } + + private QueueMetricsTestcase.Builder + createQueueMetricsTestcaseWithContainers() { + return createDefaultQueueMetricsTestcase() + .withContainers(5); + } + + private QueueMetricsTestcase.Builder createDefaultQueueMetricsTestcase() { + return QueueMetricsTestcase.Builder.create() + .withMetricSystem(ms) + .withUser(USER) + .withPartition(RMNodeLabelsManager.NO_LABEL); + } + + @Test + public void testSetAvailableResourcesToQueue1() { + String queueName = "single"; + QueueMetrics metrics = QueueMetrics.forQueue(ms, queueName, null, + false, conf); + MetricsSource queueSource = queueSource(ms, queueName); + + metrics.setAvailableResourcesToQueue(newResource( + GB, 4, + ImmutableMap. builder() + .put(CUSTOM_RES_1, String.valueOf(5 * GB)) + .put(CUSTOM_RES_2, String.valueOf(6 * GB)) + .build())); + ResourceMetricsChecker.create() + .gaugeLong(AVAILABLE_MB, GB) + .gaugeInt(AVAILABLE_V_CORES, 4) + .checkAgainst(queueSource); + + assertCustomResourceValue(metrics, + MetricsForCustomResource.AVAILABLE, CUSTOM_RES_1, 5 * GB); + assertCustomResourceValue(metrics, + MetricsForCustomResource.AVAILABLE, CUSTOM_RES_2, 6 * GB); + } + + @Test + public void testSetAvailableResourcesToQueue2() { + String queueName = "single"; + QueueMetrics metrics = QueueMetrics.forQueue(ms, queueName, null, + false, conf); + MetricsSource queueSource = queueSource(ms, queueName); + + metrics.setAvailableResourcesToQueue(null, + newResource(GB, 4, + ImmutableMap. builder() + .put(CUSTOM_RES_1, String.valueOf(15 * GB)) + .put(CUSTOM_RES_2, String.valueOf(20 * GB)) + .build())); + ResourceMetricsChecker.create() + .gaugeLong(AVAILABLE_MB, GB) + .gaugeInt(AVAILABLE_V_CORES, 4) + .checkAgainst(queueSource); + + assertCustomResourceValue(metrics, + MetricsForCustomResource.AVAILABLE, CUSTOM_RES_1, 15 * GB); + assertCustomResourceValue(metrics, + MetricsForCustomResource.AVAILABLE, CUSTOM_RES_2, 20 * GB); + } + + @Test + public void testIncreasePendingResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResourceToDecrease( + newResource(GB, 2, getCustomResourcesWithValue(2 * GB)), 2) + .withResources(defaultResource) + .build(); + + testcase.testIncreasePendingResources(); + } + + @Test + public void testDecreasePendingResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResourceToDecrease( + newResource(GB, 2, getCustomResourcesWithValue(2 * GB)), 2) + .withResources(defaultResource) + .build(); + + testcase.testIncreasePendingResources(); + testcase.testDecreasePendingResources(); + } + + @Test + public void testAllocateResourcesWithoutDecreasePending() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResources(defaultResource) + .build(); + + testcase.testAllocateResources(false); + } + + @Test + public void testAllocateResourcesWithDecreasePending() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResourceToDecrease( + newResource(GB, 2, getCustomResourcesWithValue(2 * GB)), 2) + .withResources(defaultResource) + .build(); + + //first, increase pending resources + testcase.testIncreasePendingResources(); + + //then allocate with decrease pending resources + testcase.testAllocateResources(true); + } + + @Test + public void testAllocateResourcesWithoutContainer() { + QueueMetricsTestcase testcase = createDefaultQueueMetricsTestcase() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResources(defaultResource) + .build(); + + //first, increase pending resources + testcase.testIncreasePendingResourcesWithoutContainer(); + + testcase.testAllocateResourcesWithoutContainer(); + } + + @Test + public void testReleaseResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResourceToDecrease( + newResource(GB, 2, getCustomResourcesWithValue(2 * GB)), 2) + .withResources(defaultResource) + .build(); + + //first, allocate some resources + testcase.testAllocateResources(false); + + testcase.testReleaseResourcesWithContainers(); + } + + @Test + public void testUpdatePreemptedSecondsForCustomResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createFourLevelQueueHierarchy()) + .withResources(defaultResource) + .build(); + + final int seconds = 1; + testcase.testUpdatePreemptedSeconds(seconds); + } + + @Test + public void testUpdatePreemptedSecondsForCustomResourcesMoreSeconds() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createFourLevelQueueHierarchy()) + .withResources(defaultResource) + .build(); + + final int seconds = 15; + testcase.testUpdatePreemptedSeconds(seconds); + } + + @Test + public void testReserveResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResources(defaultResource) + .build(); + + testcase.testReserveResources(); + } + + @Test + public void testUnreserveResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResources(defaultResource) + .build(); + + testcase.testReserveResources(); + testcase.testUnreserveResources(); + } + + @Test + public void testGetAllocatedResourcesWithCustomResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withQueueHierarchy(createBasicQueueHierarchy()) + .withResources(defaultResource) + .build(); + + testcase.testGetAllocatedResources(); + } + + @Test + public void testGetAllocatedResourcesWithoutCustomResources() { + QueueMetricsTestcase testcase = createQueueMetricsTestcaseWithContainers() + .withResources(newResource(4 * GB, 4, Collections.emptyMap())) + .withQueueHierarchy(createBasicQueueHierarchy()) + .build(); + + testcase.testGetAllocatedResources(); + } + + @Test + public void testGetMaxUtilizationOfCustomResourcesWithoutAllocatedResource() { + MultiQueueSetup mqs = new MultiQueueSetup(ms, + QueueHierarchy.create(ROOT_QUEUE_NAME, LEAF_QUEUE_NAME), USER); + Resource clusterResource = newResource(4 * GB, 8, + ImmutableMap.builder() + .put(CUSTOM_RES_1, String.valueOf(0L)) + .put(CUSTOM_RES_2, String.valueOf(0L)) + .build()); + float utilization = mqs.getLeafMetrics() + .getMaxUtilizationOfCustomResources(clusterResource); + assertEquals(0, utilization, 0.0); + } + + @Test + public void testGetMaxUtilizationOfCustomResourcesWithAllocatedResource() { + MultiQueueSetup mqs = new MultiQueueSetup(ms, + QueueHierarchy.create(ROOT_QUEUE_NAME, LEAF_QUEUE_NAME), USER); + + Resource allocatedResource = newResource(4 * GB, 8, + ImmutableMap.builder() + .put(CUSTOM_RES_1, String.valueOf(10L)) + .put(CUSTOM_RES_2, String.valueOf(20L)) + .build()); + mqs.getLeafMetrics().allocateResources(RMNodeLabelsManager.NO_LABEL, + mqs.user, 1, allocatedResource, false); + + Resource clusterResource = newResource(4 * GB, 8, + ImmutableMap.builder() + .put(CUSTOM_RES_1, String.valueOf(0L)) + .put(CUSTOM_RES_2, String.valueOf(0L)) + .build()); + float utilization = mqs.getLeafMetrics() + .getMaxUtilizationOfCustomResources(clusterResource); + assertEquals(0, utilization, 0.0); + } + + @Test + public void testGetMaxUtilizationOfCustomResourcesWithAllocatedResource2() { + MultiQueueSetup mqs = new MultiQueueSetup(ms, + QueueHierarchy.create(ROOT_QUEUE_NAME, LEAF_QUEUE_NAME), USER); + + Resource allocatedResource = newResource(4 * GB, 8, + ImmutableMap.builder() + .put(CUSTOM_RES_1, String.valueOf(10L)) + .put(CUSTOM_RES_2, String.valueOf(20L)) + .build()); + mqs.getLeafMetrics().allocateResources(RMNodeLabelsManager.NO_LABEL, + mqs.user, 1, allocatedResource, false); + + Resource clusterResource = newResource(4 * GB, 8, + ImmutableMap.builder() + .put(CUSTOM_RES_1, String.valueOf(5L)) + .put(CUSTOM_RES_2, String.valueOf(5L)) + .build()); + float utilization = mqs.getLeafMetrics() + .getMaxUtilizationOfCustomResources(clusterResource); + assertEquals(4.0, utilization, 0.0); + } + +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java index c692bae3e60..5fb436db062 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java @@ -54,7 +54,6 @@ import java.io.IOException; import java.util.Map; import java.util.Set; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -466,6 +465,7 @@ public FiCaSchedulerApp getApplicationAttempt( csAssignment); } + //TODO move to org.apache.hadoop.yarn.resourcetypes.ResourceTypesTestHelper /** * An easy way to create resources other than memory and vcores for tests. * @param memory memory