YARN-9764. Print application submission context label in application …

…summary. Contributed by Manoj Kumar
apache · Sep 9, 2019 · 43e389b · 43e389b
1 parent ca32917
commit 43e389b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...urcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/...urcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
@@ -215,7 +215,14 @@ public static SummaryBuilder createAppSummary(RMApp app) {
                   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/...cemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/...cemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
@@ -1063,6 +1063,9 @@ public void testRMAppSubmitInvalidResourceRequest() throws Exception {
   @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");
@@ -1101,6 +1104,7 @@ public void testEscapeApplicationSummary() {
     assertTrue(msg.contains("preemptedResources=<memory:1234\\, vCores:56>"));
     assertTrue(msg.contains("applicationType=MAPREDUCE"));
     assertTrue(msg.contains("applicationTags=tag1\\,tag2"));
+    assertTrue(msg.contains("applicationNodeLabel=test"));
   }
 
   @Test