big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-10456. RM PartitionQueueMetrics records are named QueueMetrics in Simon metrics registry. Contributed by Eric Payne.

Browse Source
This commit is contained in:
Jim Brennan 2021-07-15 14:23:31 +00:00
parent df44178eb6
commit 632f64cadb
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
View File

@ -181,7 +181,11 @@ public class QueueMetrics implements MetricsSource {
public QueueMetrics(MetricsSystem ms, String queueName, Queue parent, public QueueMetrics(MetricsSystem ms, String queueName, Queue parent,
boolean enableUserMetrics, Configuration conf) { boolean enableUserMetrics, Configuration conf) {
if (this instanceof PartitionQueueMetrics) {
registry = new MetricsRegistry(P_RECORD_INFO);
} else {
registry = new MetricsRegistry(RECORD_INFO); registry = new MetricsRegistry(RECORD_INFO);
}
this.queueName = queueName; this.queueName = queueName;
this.parent = parent != null ? parent.getMetrics() : null; this.parent = parent != null ? parent.getMetrics() : null;

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestPartitionQueueMetrics.java
View File

@ -37,6 +37,7 @@
import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.server.utils.BuilderUtils;
import org.apache.hadoop.yarn.util.resource.Resources; import org.apache.hadoop.yarn.util.resource.Resources;
import org.junit.After; import org.junit.After;
import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -110,6 +111,13 @@ public void testSinglePartitionWithSingleLevelQueueMetrics()
checkResources(partitionSource, 0, 0, 0, 200 * GB, 200, 5 * GB, 5, 5); checkResources(partitionSource, 0, 0, 0, 200 * GB, 200, 5 * GB, 5, 5);
checkResources(rootQueueSource, 0, 0, 0, 200 * GB, 200, 5 * GB, 5, 5); checkResources(rootQueueSource, 0, 0, 0, 200 * GB, 200, 5 * GB, 5, 5);
checkResources(q2Source, 0, 0, 0, 0, 0, 3 * GB, 3, 3); checkResources(q2Source, 0, 0, 0, 0, 0, 3 * GB, 3, 3);
PartitionQueueMetrics pq1 =
new PartitionQueueMetrics(ms, "root.q1", parentQueue, true, CONF, "x");
Assert.assertTrue("Name of registry should be \""
+ PartitionQueueMetrics.P_RECORD_INFO.name() + "\", but was \""
+ pq1.registry.info().name() + "\".", pq1.registry.info().name()
.compareTo(PartitionQueueMetrics.P_RECORD_INFO.name()) == 0);
} }
/** /**