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:17:53 UTC
[hadoop] branch branch-2.10 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 branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 4fce8c8 YARN-10116. Expose diagnostics in RMAppManager summary
4fce8c8 is described below
commit 4fce8c8023b1fa71a38e3d58309dadf6beddd280
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)
(cherry picked from commit 147897da4b420b4749f3c7b410f4c329632c3352)
(cherry picked from commit fa35b8370ce14c9b8ee911b73fda380817b964fd)
---
.../org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java | 3 ++-
.../org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java | 4 ++++
2 files changed, 6 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/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 4be5e2a..b0afb23 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
@@ -208,7 +208,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 1a04e6c..bbe481e 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
@@ -844,6 +844,8 @@ public class TestAppManager{
new RMAppMetrics(Resource.newInstance(1234, 56),
10, 1, resourceSecondsMap, new HashMap<String, Long>());
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);
@@ -866,6 +868,8 @@ public class TestAppManager{
Assert.assertTrue(msg.contains("applicationType=MAPREDUCE"));
Assert.assertTrue(msg.contains("applicationTags=tag1\\,tag2"));
Assert.assertTrue(msg.contains("applicationNodeLabel=test"));
+ Assert.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