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 jh...@apache.org on 2020/02/05 19:16:43 UTC
[hadoop] branch trunk updated: YARN-10116. Expose diagnostics in
RMAppManager summary
This is an automated email from the ASF dual-hosted git repository.
jhung 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 314e2f9 YARN-10116. Expose diagnostics in RMAppManager summary
314e2f9 is described below
commit 314e2f9d2e888fae1e5bf669aeeead84a928d282
Author: Jonathan Hung <jh...@linkedin.com>
AuthorDate: Tue Feb 4 13:52:25 2020 -0800
YARN-10116. Expose diagnostics in RMAppManager summary
---
.../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 338a4d3..2b806dd 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
@@ -227,8 +227,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 dfb49ba..a081764 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
@@ -1088,6 +1088,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);
@@ -1110,6 +1112,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org