Repository: hadoop Updated Branches: refs/heads/branch-2.9 db74ada80 -> 42deb5404
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) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/42deb540 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42deb540 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42deb540 Branch: refs/heads/branch-2.9 Commit: 42deb54049a4f7127e44c3f4ea3f8844a01ecb22 Parents: db74ada Author: Weiwei Yang <[email protected]> Authored: Wed Dec 6 12:21:52 2017 +0800 Committer: Weiwei Yang <[email protected]> Committed: Wed Dec 6 20:22:52 2017 +0800 ---------------------------------------------------------------------- .../yarn/server/nodemanager/webapp/AllContainersPage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/42deb540/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java ---------------------------------------------------------------------- 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 24b8575..d0b42f4 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")._() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
