From 8c9824bf283d2c1f0f59951e88a04f5ca5901ffb Mon Sep 17 00:00:00 2001 From: Akshat Bordia <31816865+akshatb1@users.noreply.github.com> Date: Tue, 24 Aug 2021 11:54:50 +0530 Subject: [PATCH 1/5] Adding metrics for getClusterMetrics and getApplications APIs in FederationClientInterceptor --- .../src/main/native/UpgradeLog.htm | Bin 0 -> 31762 bytes .../src/main/winutils/UpgradeLog.htm | Bin 0 -> 33514 bytes .../yarn/server/router/RouterMetrics.java | 33 ++++++++++++++ .../clientrm/FederationClientInterceptor.java | 35 ++++++++++++--- .../yarn/server/router/TestRouterMetrics.java | 42 ++++++++++++++++++ 5 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 hadoop-common-project/hadoop-common/src/main/native/UpgradeLog.htm create mode 100644 hadoop-common-project/hadoop-common/src/main/winutils/UpgradeLog.htm diff --git a/hadoop-common-project/hadoop-common/src/main/native/UpgradeLog.htm b/hadoop-common-project/hadoop-common/src/main/native/UpgradeLog.htm new file mode 100644 index 0000000000000000000000000000000000000000..651cf8c9d0d07984b95b5765c0b3ac93c188a1f2 GIT binary patch literal 31762 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 literal 0 HcmV?d00001 diff --git a/hadoop-common-project/hadoop-common/src/main/winutils/UpgradeLog.htm b/hadoop-common-project/hadoop-common/src/main/winutils/UpgradeLog.htm new file mode 100644 index 0000000000000000000000000000000000000000..3bd7338ed4fc4a3281bfdbea9a1bbae6f1990a48 GIT binary patch literal 33514 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 subclusters = federationFacade.getSubClusters(true); ClientMethod remoteMethod = new ClientMethod("getApplications", new Class[] {GetApplicationsRequest.class}, new Object[] {request}); - Map applications = - invokeConcurrent(subclusters.keySet(), remoteMethod, - GetApplicationsResponse.class); + Map applications = new HashMap<>(); + + try { + applications = invokeConcurrent(subclusters.keySet(), remoteMethod, + GetApplicationsResponse.class); + } catch (Exception ex) { + routerMetrics.incrMultipleAppsFailedRetrieved(); + LOG.error("Unable to get applications due to exception.", ex); + throw ex; + } + long stopTime = clock.getTime(); + routerMetrics.succeededMultipleAppsRetrieved(stopTime - startTime); // Merge the Application Reports return RouterYarnClientUtils.mergeApplications(applications.values(), returnPartialReport); @@ -648,14 +660,27 @@ public GetApplicationsResponse getApplications(GetApplicationsRequest request) @Override public GetClusterMetricsResponse getClusterMetrics( GetClusterMetricsRequest request) throws YarnException, IOException { + long startTime = clock.getTime(); Map subclusters = federationFacade.getSubClusters(true); ClientMethod remoteMethod = new ClientMethod("getClusterMetrics", new Class[] {GetClusterMetricsRequest.class}, new Object[] {request}); ArrayList clusterList = new ArrayList<>(subclusters.keySet()); Map clusterMetrics = - invokeConcurrent(clusterList, remoteMethod, - GetClusterMetricsResponse.class); + new HashMap<>(); + + try { + clusterMetrics = invokeConcurrent(clusterList, remoteMethod, + GetClusterMetricsResponse.class); + + } catch (Exception ex) { + routerMetrics.incrGetClusterMetricsFailedRetrieved(); + LOG.error("Unable to get cluster metrics due to exception.", ex); + throw ex; + } + + long stopTime = clock.getTime(); + routerMetrics.succeededGetClusterMetricsRetrieved(stopTime - startTime); return RouterYarnClientUtils.merge(clusterMetrics.values()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java index 1456a42e6bd69..713e77376dbc2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java @@ -279,6 +279,37 @@ public void testMulipleAppsReportFailed() { metrics.getMultipleAppsFailedRetrieved()); } + /** + * This test validates the correctness of the metric: Retrieved getClusterMetrics + * multiple times successfully. + */ + @Test + public void testSucceededGetClusterMetrics() { + long totalGoodBefore = metrics.getNumSucceededGetClusterMetricsRetrieved(); + goodSubCluster.getClusterMetrics(100); + Assert.assertEquals(totalGoodBefore + 1, + metrics.getNumSucceededGetClusterMetricsRetrieved()); + Assert.assertEquals(100, metrics.getLatencySucceededGetClusterMetricsRetrieved(), + 0); + goodSubCluster.getClusterMetrics(200); + Assert.assertEquals(totalGoodBefore + 2, + metrics.getNumSucceededGetClusterMetricsRetrieved()); + Assert.assertEquals(150, metrics.getLatencySucceededGetClusterMetricsRetrieved(), + 0); + } + + /** + * This test validates the correctness of the metric: Failed to + * retrieve getClusterMetrics. + */ + @Test + public void testGetClusterMetricsFailed() { + long totalBadbefore = metrics.getClusterMetricsFailedRetrieved(); + badSubCluster.getClusterMetrics(); + Assert.assertEquals(totalBadbefore + 1, + metrics.getClusterMetricsFailedRetrieved()); + } + // Records failures for all calls private class MockBadSubCluster { public void getNewApplication() { @@ -310,6 +341,11 @@ public void getApplicationsReport() { LOG.info("Mocked: failed getApplicationsReport call"); metrics.incrMultipleAppsFailedRetrieved(); } + + public void getClusterMetrics() { + LOG.info("Mocked: failed getClusterMetrics call"); + metrics.incrGetClusterMetricsFailedRetrieved(); + } } // Records successes for all calls @@ -350,5 +386,11 @@ public void getApplicationsReport(long duration) { duration); metrics.succeededMultipleAppsRetrieved(duration); } + + public void getClusterMetrics(long duration){ + LOG.info("Mocked: successful getClusterMetrics call with duration {}", + duration); + metrics.succeededGetClusterMetricsRetrieved(duration); + } } } From 84c56b00c756f3f42fe457d22d05abde8bb51fcc Mon Sep 17 00:00:00 2001 From: Akshat Bordia <31816865+akshatb1@users.noreply.github.com> Date: Tue, 24 Aug 2021 12:02:10 +0530 Subject: [PATCH 2/5] Removing the inadvertent log files --- .../src/main/native/UpgradeLog.htm | Bin 31762 -> 0 bytes .../src/main/winutils/UpgradeLog.htm | Bin 33514 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 hadoop-common-project/hadoop-common/src/main/native/UpgradeLog.htm delete mode 100644 hadoop-common-project/hadoop-common/src/main/winutils/UpgradeLog.htm diff --git a/hadoop-common-project/hadoop-common/src/main/native/UpgradeLog.htm b/hadoop-common-project/hadoop-common/src/main/native/UpgradeLog.htm deleted file mode 100644 index 651cf8c9d0d07984b95b5765c0b3ac93c188a1f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31762 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 diff --git a/hadoop-common-project/hadoop-common/src/main/winutils/UpgradeLog.htm b/hadoop-common-project/hadoop-common/src/main/winutils/UpgradeLog.htm deleted file mode 100644 index 3bd7338ed4fc4a3281bfdbea9a1bbae6f1990a48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33514 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 Date: Tue, 24 Aug 2021 22:37:34 +0530 Subject: [PATCH 3/5] Removing redundant initialization --- .../server/router/clientrm/FederationClientInterceptor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java index ada3baa6dbb8d..22daf87c2cfc4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java @@ -639,7 +639,7 @@ public GetApplicationsResponse getApplications(GetApplicationsRequest request) federationFacade.getSubClusters(true); ClientMethod remoteMethod = new ClientMethod("getApplications", new Class[] {GetApplicationsRequest.class}, new Object[] {request}); - Map applications = new HashMap<>(); + Map applications; try { applications = invokeConcurrent(subclusters.keySet(), remoteMethod, @@ -666,8 +666,7 @@ public GetClusterMetricsResponse getClusterMetrics( ClientMethod remoteMethod = new ClientMethod("getClusterMetrics", new Class[] {GetClusterMetricsRequest.class}, new Object[] {request}); ArrayList clusterList = new ArrayList<>(subclusters.keySet()); - Map clusterMetrics = - new HashMap<>(); + Map clusterMetrics; try { clusterMetrics = invokeConcurrent(clusterList, remoteMethod, From 320c37ded1261b77f1ff9909359f2b85e9e37541 Mon Sep 17 00:00:00 2001 From: Akshat Bordia <31816865+akshatb1@users.noreply.github.com> Date: Mon, 6 Sep 2021 19:25:43 +0530 Subject: [PATCH 4/5] Applying Hadoop CodeStyle --- .../hadoop/yarn/server/router/RouterMetrics.java | 4 ++-- .../router/clientrm/FederationClientInterceptor.java | 4 ++-- .../hadoop/yarn/server/router/TestRouterMetrics.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java index 47e8a82d76cf9..37e7419222a3a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java @@ -72,7 +72,7 @@ public final class RouterMetrics { "appAttempt reports and latency(ms)") private MutableRate totalSucceededAppAttemptsRetrieved; @Metric("Total number of successful Retrieved getClusterMetrics and " - + "latency(ms)") + + "latency(ms)") private MutableRate totalSucceededGetClusterMetricsRetrieved; @@ -111,7 +111,7 @@ private RouterMetrics() { "report", "ops", "latency", 10); getClusterMetricsLatency = registry.newQuantiles("getClusterMetricsLatency", - "latency of get cluster metrics", "ops", "latency", 10); + "latency of get cluster metrics", "ops", "latency", 10); } public static RouterMetrics getMetrics() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java index 22daf87c2cfc4..d65db1e7c2971 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java @@ -643,7 +643,7 @@ public GetApplicationsResponse getApplications(GetApplicationsRequest request) try { applications = invokeConcurrent(subclusters.keySet(), remoteMethod, - GetApplicationsResponse.class); + GetApplicationsResponse.class); } catch (Exception ex) { routerMetrics.incrMultipleAppsFailedRetrieved(); @@ -670,7 +670,7 @@ public GetClusterMetricsResponse getClusterMetrics( try { clusterMetrics = invokeConcurrent(clusterList, remoteMethod, - GetClusterMetricsResponse.class); + GetClusterMetricsResponse.class); } catch (Exception ex) { routerMetrics.incrGetClusterMetricsFailedRetrieved(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java index 713e77376dbc2..4d4838a560b48 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java @@ -288,14 +288,14 @@ public void testSucceededGetClusterMetrics() { long totalGoodBefore = metrics.getNumSucceededGetClusterMetricsRetrieved(); goodSubCluster.getClusterMetrics(100); Assert.assertEquals(totalGoodBefore + 1, - metrics.getNumSucceededGetClusterMetricsRetrieved()); + metrics.getNumSucceededGetClusterMetricsRetrieved()); Assert.assertEquals(100, metrics.getLatencySucceededGetClusterMetricsRetrieved(), - 0); + 0); goodSubCluster.getClusterMetrics(200); Assert.assertEquals(totalGoodBefore + 2, - metrics.getNumSucceededGetClusterMetricsRetrieved()); + metrics.getNumSucceededGetClusterMetricsRetrieved()); Assert.assertEquals(150, metrics.getLatencySucceededGetClusterMetricsRetrieved(), - 0); + 0); } /** @@ -307,7 +307,7 @@ public void testGetClusterMetricsFailed() { long totalBadbefore = metrics.getClusterMetricsFailedRetrieved(); badSubCluster.getClusterMetrics(); Assert.assertEquals(totalBadbefore + 1, - metrics.getClusterMetricsFailedRetrieved()); + metrics.getClusterMetricsFailedRetrieved()); } // Records failures for all calls From 7c300137710e18af16fdc547b75d176fa0b5a36f Mon Sep 17 00:00:00 2001 From: Akshat Bordia <31816865+akshatb1@users.noreply.github.com> Date: Wed, 8 Sep 2021 09:55:55 +0530 Subject: [PATCH 5/5] Removing unused import --- .../yarn/server/router/clientrm/FederationClientInterceptor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java index d65db1e7c2971..391bc1ca98fbd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random;