This is an automated email from the ASF dual-hosted git repository. jhung pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push: new aca9304 YARN-10116. Expose diagnostics in RMAppManager summary aca9304 is described below commit aca930402c4a3e09a62b48fcba2097e737506fef Author: Jonathan Hung <jh...@linkedin.com> AuthorDate: Tue Feb 4 13:52:25 2020 -0800 YARN-10116. Expose diagnostics in RMAppManager summary (cherry picked from commit 314e2f9d2e888fae1e5bf669aeeead84a928d282) --- .../org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java | 4 ++-- .../org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index 911791b..c8b36c4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -223,8 +223,8 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>, == null ? "" : app.getApplicationSubmissionContext() - .getNodeLabelExpression()); - + .getNodeLabelExpression()) + .add("diagnostics", app.getDiagnostics()); return summary; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index 55ca94a..1dd19c3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -1083,6 +1083,8 @@ public class TestAppManager extends AppManagerTestBase{ new RMAppMetrics(Resource.newInstance(1234, 56), 10, 1, resourceSecondsMap, new HashMap<>()); when(app.getRMAppMetrics()).thenReturn(metrics); + when(app.getDiagnostics()).thenReturn(new StringBuilder( + "Multiline\n\n\r\rDiagnostics=Diagn,ostic")); RMAppManager.ApplicationSummary.SummaryBuilder summary = new RMAppManager.ApplicationSummary().createAppSummary(app); @@ -1105,6 +1107,8 @@ public class TestAppManager extends AppManagerTestBase{ assertTrue(msg.contains("applicationType=MAPREDUCE")); assertTrue(msg.contains("applicationTags=tag1\\,tag2")); assertTrue(msg.contains("applicationNodeLabel=test")); + assertTrue(msg.contains("diagnostics=Multiline" + escaped + + "Diagnostics\\=Diagn\\,ostic")); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org