From 05c347fe51c01494ed8110f8f116a01c90205f13 Mon Sep 17 00:00:00 2001 From: Weiwei Yang Date: Wed, 6 Dec 2017 12:21:52 +0800 Subject: [PATCH] YARN-7611. Node manager web UI should display container type in containers page. Contributed by Weiwei Yang. --- .../yarn/server/nodemanager/webapp/AllContainersPage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java index 3fc6f3cb9df..afc96924a0a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java +++ b/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").__()