From db74ada80f4237726e15bd6def873081428a7210 Mon Sep 17 00:00:00 2001 From: Weiwei Yang Date: Wed, 6 Dec 2017 19:58:51 +0800 Subject: [PATCH] Revert "YARN-7611. Node manager web UI should display container type in containers page. Contributed by Weiwei Yang." This reverts commit 218d622529a45ea215cbf262221a06bc5b693f85. --- .../yarn/server/nodemanager/webapp/AllContainersPage.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 6196a66629d..24b85753b18 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, executiontype, containerid, log-url + // containerid, containerid, log-url append(", aoColumns:[").append(getContainersIdColumnDefs()) - .append(", null, null, {bSearchable:false}]} ").toString(); + .append(", null, {bSearchable:false}]} ").toString(); } private String getContainersIdColumnDefs() { @@ -83,7 +83,6 @@ public class AllContainersPage extends NMView { .thead() .tr() .td()._("ContainerId")._() - .td().__("ExecutionType").__() .td()._("ContainerState")._() .td()._("logs")._() ._() @@ -95,7 +94,6 @@ 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")._()