You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ww...@apache.org on 2017/12/06 12:07:32 UTC
hadoop git commit: Revert "YARN-7611. Node manager web UI should
display container type in containers page. Contributed by Weiwei Yang."
Repository: hadoop
Updated Branches:
refs/heads/branch-2.9 218d62252 -> db74ada80
Revert "YARN-7611. Node manager web UI should display container type in containers page. Contributed by Weiwei Yang."
This reverts commit 218d622529a45ea215cbf262221a06bc5b693f85.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db74ada8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db74ada8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db74ada8
Branch: refs/heads/branch-2.9
Commit: db74ada80f4237726e15bd6def873081428a7210
Parents: 218d622
Author: Weiwei Yang <ww...@apache.org>
Authored: Wed Dec 6 19:58:51 2017 +0800
Committer: Weiwei Yang <ww...@apache.org>
Committed: Wed Dec 6 19:58:51 2017 +0800
----------------------------------------------------------------------
.../yarn/server/nodemanager/webapp/AllContainersPage.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/db74ada8/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 6196a66..24b8575 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")._()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org