This is an automated email from the ASF dual-hosted git repository.
jhung pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new d2eabbd YARN-9764. Print application submission context label in
application summary. Contributed by Manoj Kumar
d2eabbd is described below
commit d2eabbd7fd8adebdb36e6d06966a17a3891f4066
Author: Jonathan Hung <[email protected]>
AuthorDate: Sun Sep 8 19:19:05 2019 -0700
YARN-9764. Print application submission context label in application
summary. Contributed by Manoj Kumar
---
.../apache/hadoop/yarn/server/resourcemanager/RMAppManager.java | 8 +++++++-
.../apache/hadoop/yarn/server/resourcemanager/TestAppManager.java | 4 ++++
2 files changed, 11 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 2ec02f4..84a5383 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
@@ -198,7 +198,13 @@ public class RMAppManager implements
EventHandler<RMAppManagerEvent>,
metrics.getPreemptedResourceSecondsMap()))
.add("applicationTags", StringHelper.CSV_JOINER.join(
app.getApplicationTags() != null ? new TreeSet<>(
- app.getApplicationTags()) : Collections.<String>emptySet()));
+ app.getApplicationTags()) : Collections.<String>emptySet()))
+ .add("applicationNodeLabel",
+ app.getApplicationSubmissionContext().getNodeLabelExpression()
+ == null
+ ? ""
+ : app.getApplicationSubmissionContext()
+ .getNodeLabelExpression());
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 584fe94..e7bb2d3 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
@@ -823,6 +823,9 @@ public class TestAppManager{
@Test (timeout = 30000)
public void testEscapeApplicationSummary() {
RMApp app = mock(RMAppImpl.class);
+ ApplicationSubmissionContext asc =
mock(ApplicationSubmissionContext.class);
+ when(asc.getNodeLabelExpression()).thenReturn("test");
+ when(app.getApplicationSubmissionContext()).thenReturn(asc);
when(app.getApplicationId()).thenReturn(
ApplicationId.newInstance(100L, 1));
when(app.getName()).thenReturn("Multiline\n\n\r\rAppName");
@@ -861,6 +864,7 @@ public class TestAppManager{
Assert.assertTrue(msg.contains("preemptedResources=<memory:1234\\,
vCores:56>"));
Assert.assertTrue(msg.contains("applicationType=MAPREDUCE"));
Assert.assertTrue(msg.contains("applicationTags=tag1\\,tag2"));
+ Assert.assertTrue(msg.contains("applicationNodeLabel=test"));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
