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 wa...@apache.org on 2017/12/10 21:54:39 UTC
[06/50] [abbrv] hadoop git commit: YARN-7611. Node manager web UI
should display container type in containers page. Contributed by Weiwei Yang.
YARN-7611. Node manager web UI should display container type in containers page. Contributed by Weiwei Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05c347fe
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05c347fe
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05c347fe
Branch: refs/heads/YARN-6592
Commit: 05c347fe51c01494ed8110f8f116a01c90205f13
Parents: 73b8697
Author: Weiwei Yang <ww...@apache.org>
Authored: Wed Dec 6 12:21:52 2017 +0800
Committer: Weiwei Yang <ww...@apache.org>
Committed: Wed Dec 6 12:21: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/05c347fe/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 3fc6f3c..afc9692 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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org