You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by pb...@apache.org on 2021/05/17 11:31:23 UTC
[hadoop] branch trunk updated: YARN-10763. Add the number of
containers assigned per second metrics to ClusterMetrics. Contributed by
chaosju.
This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8891e5c YARN-10763. Add the number of containers assigned per second metrics to ClusterMetrics. Contributed by chaosju.
8891e5c is described below
commit 8891e5c028299803410b93f52e0a61df16f84d62
Author: Peter Bacsko <pb...@cloudera.com>
AuthorDate: Mon May 17 13:30:12 2021 +0200
YARN-10763. Add the number of containers assigned per second metrics to ClusterMetrics. Contributed by chaosju.
---
.../server/resourcemanager/ClusterMetrics.java | 37 ++++++++++++++++++++++
.../scheduler/AppSchedulingInfo.java | 2 ++
.../webapp/dao/ClusterMetricsInfo.java | 8 +++++
.../server/resourcemanager/TestClusterMetrics.java | 17 ++++++++++
.../resourcemanager/webapp/TestRMWebServices.java | 2 +-
5 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java
index a02eeef..67a3a62 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java
@@ -21,8 +21,12 @@ package org.apache.hadoop.yarn.server.resourcemanager;
import static org.apache.hadoop.metrics2.lib.Interns.info;
import java.util.Map;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsInfo;
import org.apache.hadoop.metrics2.MetricsSystem;
@@ -66,6 +70,8 @@ public class ClusterMetrics {
rmEventProcCPUAvg;
@Metric("RM Event Processor CPU Usage 60 second Max") MutableGaugeLong
rmEventProcCPUMax;
+ @Metric("# of Containers assigned in the last second") MutableGaugeInt
+ containerAssignedPerSecond;
private boolean rmEventProcMonitorEnable = false;
@@ -85,6 +91,22 @@ public class ClusterMetrics {
private static volatile ClusterMetrics INSTANCE = null;
private static MetricsRegistry registry;
+ private AtomicInteger numContainersAssigned = new AtomicInteger(0);
+ private ScheduledThreadPoolExecutor assignCounterExecutor;
+
+ ClusterMetrics() {
+ assignCounterExecutor = new ScheduledThreadPoolExecutor(1,
+ new ThreadFactoryBuilder().
+ setDaemon(true).setNameFormat("ContainerAssignmentCounterThread").
+ build());
+ assignCounterExecutor.scheduleAtFixedRate(new Runnable() {
+ @Override
+ public void run() {
+ containerAssignedPerSecond.set(numContainersAssigned.getAndSet(0));
+ }
+ }, 1, 1, TimeUnit.SECONDS);
+ }
+
public static ClusterMetrics getMetrics() {
if(!isInitialized.get()){
synchronized (ClusterMetrics.class) {
@@ -120,6 +142,9 @@ public class ClusterMetrics {
@VisibleForTesting
public synchronized static void destroy() {
+ if (INSTANCE != null && INSTANCE.getAssignCounterExecutor() != null) {
+ INSTANCE.getAssignCounterExecutor().shutdownNow();
+ }
isInitialized.set(false);
INSTANCE = null;
}
@@ -319,4 +344,16 @@ public class ClusterMetrics {
public void incrUtilizedVirtualCores(long delta) {
utilizedVirtualCores.incr(delta);
}
+
+ public int getContainerAssignedPerSecond() {
+ return containerAssignedPerSecond.value();
+ }
+
+ public void incrNumContainerAssigned() {
+ numContainersAssigned.incrementAndGet();
+ }
+
+ private ScheduledThreadPoolExecutor getAssignCounterExecutor(){
+ return assignCounterExecutor;
+ }
}
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/AppSchedulingInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index a3b235b..2b2f832 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
+import org.apache.hadoop.yarn.server.resourcemanager.ClusterMetrics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -773,6 +774,7 @@ public class AppSchedulingInfo {
containerAllocated.getContainer().getResource());
}
queue.getMetrics().incrNodeTypeAggregations(user, type);
+ ClusterMetrics.getMetrics().incrNumContainerAssigned();
}
// Get AppPlacementAllocator by specified schedulerKey
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java
index 779d233..7dc2d8a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java
@@ -67,6 +67,8 @@ public class ClusterMetricsInfo {
private int activeNodes;
private int shutdownNodes;
+ private int containerAssignedPerSecond;
+
// Total used resource of the cluster, including all partitions
private ResourceInfo totalUsedResourcesAcrossPartition;
@@ -158,6 +160,8 @@ public class ClusterMetricsInfo {
this.shutdownNodes = clusterMetrics.getNumShutdownNMs();
this.totalNodes = activeNodes + lostNodes + decommissionedNodes
+ rebootedNodes + unhealthyNodes + decommissioningNodes + shutdownNodes;
+ this.containerAssignedPerSecond = clusterMetrics
+ .getContainerAssignedPerSecond();
}
public int getAppsSubmitted() {
@@ -411,4 +415,8 @@ public class ClusterMetricsInfo {
public boolean getCrossPartitionMetricsAvailable() {
return crossPartitionMetricsAvailable;
}
+
+ public int getContainerAssignedPerSecond() {
+ return this.containerAssignedPerSecond;
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClusterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClusterMetrics.java
index d81e278..645a2f1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClusterMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClusterMetrics.java
@@ -20,11 +20,14 @@ package org.apache.hadoop.yarn.server.resourcemanager;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.test.GenericTestUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Assert;
import org.junit.Test;
+import java.util.function.Supplier;
+
public class TestClusterMetrics {
private ClusterMetrics metrics;
@@ -63,4 +66,18 @@ public class TestClusterMetrics {
DefaultMetricsSystem.shutdown();
}
}
+
+ @Test
+ public void testClusterMetrics() throws Exception {
+ Assert.assertTrue(!metrics.containerAssignedPerSecond.changed());
+ metrics.incrNumContainerAssigned();
+ metrics.incrNumContainerAssigned();
+ GenericTestUtils.waitFor(new Supplier<Boolean>() {
+ @Override
+ public Boolean get() {
+ return metrics.getContainerAssignedPerSecond() == 2;
+ }
+ }, 500, 5000);
+ }
+
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
index 0209432..b651c79 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
@@ -474,7 +474,7 @@ public class TestRMWebServices extends JerseyTestBase {
Exception {
assertEquals("incorrect number of elements", 1, json.length());
JSONObject clusterinfo = json.getJSONObject("clusterMetrics");
- assertEquals("incorrect number of elements", 32, clusterinfo.length());
+ assertEquals("incorrect number of elements", 33, clusterinfo.length());
verifyClusterMetrics(
clusterinfo.getInt("appsSubmitted"), clusterinfo.getInt("appsCompleted"),
clusterinfo.getInt("reservedMB"), clusterinfo.getInt("availableMB"),
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org