diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyMetrics.java index b50bf0f1cae..f4f07707bf5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyMetrics.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.nodemanager.amrmproxy; import com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.annotation.Metric; import org.apache.hadoop.metrics2.annotation.Metrics; @@ -29,33 +28,32 @@ import org.apache.hadoop.metrics2.lib.MutableQuantiles; import org.apache.hadoop.metrics2.lib.MutableRate; -import java.util.concurrent.atomic.AtomicBoolean; import static org.apache.hadoop.metrics2.lib.Interns.info; -@InterfaceAudience.Private @Metrics(about = "Performance and usage metrics for YARN AMRMProxy", context = "fedr") +@Metrics(about = "Metrics for AMRMProxy", context = "fedr") public class AMRMProxyMetrics { private final MetricsInfo RECORD_INFO = - info("AMRMProxyMetrics", "Metrics for the Yarn AMRMProxy"); - @Metric("# of failed applications start requests in the node") private MutableGaugeLong + info("AMRMProxyMetrics", "Metrics for the AMRMProxy"); + @Metric("# of failed applications start requests") private MutableGaugeLong failedAppStartRequests; - @Metric("# of failed register application master requests in the node") private MutableGaugeLong + @Metric("# of failed register AM requests") private MutableGaugeLong failedRegisterAMRequests; - @Metric("# of failed finish application master requests in the node") private MutableGaugeLong + @Metric("# of failed finish AM requests") private MutableGaugeLong failedFinishAMRequests; - @Metric("# of failed allocate requests in the node") private MutableGaugeLong + @Metric("# of failed allocate requests ") private MutableGaugeLong failedAllocateRequests; - @Metric("Total number of failed applications recovery during NM retart") private MutableGaugeLong + @Metric("# of failed application recoveries") private MutableGaugeLong failedAppRecoveryCount; // Aggregate metrics are shared, and don't have to be looked up per call - @Metric("Total number of successful applications start requests and latency(ms)") private MutableRate + @Metric("Application start request latency(ms)") private MutableRate totalSucceededAppStartRequests; - @Metric("Total number of successful register application master requests and latency(ms)") private MutableRate + @Metric("Register application master latency(ms)") private MutableRate totalSucceededRegisterAMRequests; - @Metric("Total number of successful finish application master requests and latency(ms)") private MutableRate + @Metric("Finish application master latency(ms)") private MutableRate totalSucceededFinishAMRequests; - @Metric("Total number of successful allocate requests and latency(ms)") private MutableRate + @Metric("Allocate latency(ms)") private MutableRate totalSucceededAllocateRequests; // Quantile latency in ms - this is needed for SLA (95%, 99%, etc) private MutableQuantiles applicationStartLatency; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java index ae53623445a..d3c4a1d5288 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java @@ -403,12 +403,12 @@ public void processApplicationStartRequest(StartContainerRequest request) getFirstAMRMToken(credentials.getAllTokens()); if (amrmToken == null) { throw new YarnRuntimeException( - "AMRMToken not found in the start container request for application:" - + appAttemptId.toString()); + "AMRMToken not found in the start container request for " + + "application:" + appAttemptId.toString()); } - // Substitute the existing AMRM Token with a local one. Keep the rest of the - // tokens in the credentials intact. + // Substitute the existing AMRM Token with a local one. Keep the rest of + // the tokens in the credentials intact. Token localToken = this.secretManager.createAndGetAMRMToken(appAttemptId); credentials.addToken(localToken.getService(), localToken); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestAMRMProxyMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestAMRMProxyMetrics.java index eb8fde62d2d..f7cadd1bf32 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestAMRMProxyMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestAMRMProxyMetrics.java @@ -138,8 +138,8 @@ .fail("The request to finish application master should have failed"); } catch (Throwable ex) { // This is expected. So nothing required here. - LOG.info( - "Finish registration failed as expected because it was not registered"); + LOG.info("Finish registration failed as expected because it was not " + + "registered"); } Assert.assertEquals(failedAppStartRequests,