YARN-7611. Node manager web UI should display container type in containers page. Contributed by Weiwei Yang.

  Previous commit 218d622529a45ea215cbf262221a06bc5b693f85 introduces a compile error,
  so it was reverted by commit db74ada80f4237726e15bd6def873081428a7210.
  This commit fixed the issue.

(cherry picked from commit 05c347fe51c01494ed8110f8f116a01c90205f13)

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java

@@ -51,9 +51,9 @@ public class AllContainersPage extends NMView {
 
   private String containersTableInit() {
     return tableInit().
-        // containerid, containerid, log-url
+        // containerid, executiontype, containerid, log-url
         append(", aoColumns:[").append(getContainersIdColumnDefs())
-        .append(", null, {bSearchable:false}]} ").toString();
+        .append(", null, null, {bSearchable:false}]} ").toString();
   }
 
   private String getContainersIdColumnDefs() {
@@ -83,6 +83,7 @@ public class AllContainersPage extends NMView {
           .thead()
             .tr()
               .td()._("ContainerId")._()
+              .td()._("ExecutionType")._()
               .td()._("ContainerState")._()
               .td()._("logs")._()
             ._()
@@ -94,6 +95,7 @@ public class AllContainersPage extends NMView {
           .tr()
             .td().a(url("container", info.getId()), info.getId())
             ._()
+            .td()._(info.getExecutionType())._()
             .td()._(info.getState())._()
             .td()
                 .a(url(info.getShortLogLink()), "logs")._()