[01/50] [abbrv] hadoop git commit: YARN-3406. Display count of running containers in the RM's Web UI. Contributed by Ryu Kobayashi.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 9d8952f97 - 1b3b9e5c3
YARN-3406. Display count of running containers in the RM's Web UI. Contributed
by Ryu Kobayashi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4a3dabd9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4a3dabd9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4a3dabd9
Branch: refs/heads/HDFS-7240
Commit: 4a3dabd94fc39d7604b826065c23859d565f
Parents: 78fe6e5
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Sat Apr 25 07:17:11 2015 +0900
Committer: Tsuyoshi Ozawa oz...@apache.org
Committed: Sat Apr 25 07:17:11 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/server/webapp/WebPageUtils.java | 25 +---
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 9 +++
.../webapp/FairSchedulerAppsBlock.java | 2 ++
.../webapp/FairSchedulerPage.java | 2 +-
.../resourcemanager/webapp/RMAppsBlock.java | 6 -
6 files changed, 37 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4a3dabd9/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6da55b5..44b87e5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -168,6 +168,9 @@ Release 2.8.0 - UNRELEASED
YARN-3511. Add errors and warnings page to ATS. (Varun Vasudev via xgong)
+YARN-3406. Display count of running containers in the RM's Web UI.
+(Ryu Kobayashi via ozawa)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4a3dabd9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index 5acabf5..6ca5011 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -24,10 +24,11 @@ import static
org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
public class WebPageUtils {
public static String appsTableInit() {
-return appsTableInit(false);
+return appsTableInit(false, true);
}
- public static String appsTableInit(boolean isFairSchedulerPage) {
+ public static String appsTableInit(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
// id, user, name, queue, starttime, finishtime, state, status, progress,
ui
// FairSchedulerPage's table is a bit different
return tableInit()
@@ -35,22 +36,30 @@ public class WebPageUtils {
.append(, bDeferRender: true)
.append(, bProcessing: true)
.append(\n, aoColumnDefs: )
- .append(getAppsTableColumnDefs(isFairSchedulerPage))
+ .append(getAppsTableColumnDefs(isFairSchedulerPage, isResourceManager))
// Sort by id upon page load
.append(, aaSorting: [[0, 'desc']]}).toString();
}
- private static String getAppsTableColumnDefs(boolean isFairSchedulerPage) {
+ private static String getAppsTableColumnDefs(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
StringBuilder sb = new StringBuilder();
-return sb
- .append([\n)
+sb.append([\n)
.append({'sType':'string', 'aTargets': [0])
.append(, 'mRender': parseHadoopID })
.append(\n, {'sType':'numeric', 'aTargets': +
(isFairSchedulerPage ? [6, 7]: [5, 6]))
.append(, 'mRender': renderHadoopDate })
- .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9])
- .append(, 'mRender': parseHadoopProgress }]).toString();
+ .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets':);
+if (isFairSchedulerPage) {
+ sb.append([11]);
+} else if (isResourceManager) {
+ sb.append([10]);
+} else {
+ sb.append([9]);
+}
+sb.append(, 'mRender': parseHadoopProgress }]);
+return sb.toString();
}
public static String attemptsTableInit() {
[34/50] [abbrv] hadoop git commit: YARN-3406. Display count of running containers in the RM's Web UI. Contributed by Ryu Kobayashi.
YARN-3406. Display count of running containers in the RM's Web UI. Contributed
by Ryu Kobayashi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1164c7bd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1164c7bd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1164c7bd
Branch: refs/heads/YARN-2928
Commit: 1164c7bd8ed71dc8bc6e3f28b3aa2a38105dfae0
Parents: 8257b1d
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Sat Apr 25 07:17:11 2015 +0900
Committer: Zhijie Shen zjs...@apache.org
Committed: Mon Apr 27 14:18:51 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/server/webapp/WebPageUtils.java | 25 +---
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 9 +++
.../webapp/FairSchedulerAppsBlock.java | 2 ++
.../webapp/FairSchedulerPage.java | 2 +-
.../resourcemanager/webapp/RMAppsBlock.java | 6 -
6 files changed, 37 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1164c7bd/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 84d7383..605079e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -232,6 +232,9 @@ Release 2.8.0 - UNRELEASED
YARN-3511. Add errors and warnings page to ATS. (Varun Vasudev via xgong)
+YARN-3406. Display count of running containers in the RM's Web UI.
+(Ryu Kobayashi via ozawa)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1164c7bd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index 5acabf5..6ca5011 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -24,10 +24,11 @@ import static
org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
public class WebPageUtils {
public static String appsTableInit() {
-return appsTableInit(false);
+return appsTableInit(false, true);
}
- public static String appsTableInit(boolean isFairSchedulerPage) {
+ public static String appsTableInit(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
// id, user, name, queue, starttime, finishtime, state, status, progress,
ui
// FairSchedulerPage's table is a bit different
return tableInit()
@@ -35,22 +36,30 @@ public class WebPageUtils {
.append(, bDeferRender: true)
.append(, bProcessing: true)
.append(\n, aoColumnDefs: )
- .append(getAppsTableColumnDefs(isFairSchedulerPage))
+ .append(getAppsTableColumnDefs(isFairSchedulerPage, isResourceManager))
// Sort by id upon page load
.append(, aaSorting: [[0, 'desc']]}).toString();
}
- private static String getAppsTableColumnDefs(boolean isFairSchedulerPage) {
+ private static String getAppsTableColumnDefs(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
StringBuilder sb = new StringBuilder();
-return sb
- .append([\n)
+sb.append([\n)
.append({'sType':'string', 'aTargets': [0])
.append(, 'mRender': parseHadoopID })
.append(\n, {'sType':'numeric', 'aTargets': +
(isFairSchedulerPage ? [6, 7]: [5, 6]))
.append(, 'mRender': renderHadoopDate })
- .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9])
- .append(, 'mRender': parseHadoopProgress }]).toString();
+ .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets':);
+if (isFairSchedulerPage) {
+ sb.append([11]);
+} else if (isResourceManager) {
+ sb.append([10]);
+} else {
+ sb.append([9]);
+}
+sb.append(, 'mRender': parseHadoopProgress }]);
+return sb.toString();
}
public static String attemptsTableInit() {
hadoop git commit: YARN-3406. Display count of running containers in the RM's Web UI. Contributed by Ryu Kobayashi.
Repository: hadoop
Updated Branches:
refs/heads/trunk 78fe6e57c - 4a3dabd94
YARN-3406. Display count of running containers in the RM's Web UI. Contributed
by Ryu Kobayashi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4a3dabd9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4a3dabd9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4a3dabd9
Branch: refs/heads/trunk
Commit: 4a3dabd94fc39d7604b826065c23859d565f
Parents: 78fe6e5
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Sat Apr 25 07:17:11 2015 +0900
Committer: Tsuyoshi Ozawa oz...@apache.org
Committed: Sat Apr 25 07:17:11 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/server/webapp/WebPageUtils.java | 25 +---
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 9 +++
.../webapp/FairSchedulerAppsBlock.java | 2 ++
.../webapp/FairSchedulerPage.java | 2 +-
.../resourcemanager/webapp/RMAppsBlock.java | 6 -
6 files changed, 37 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4a3dabd9/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6da55b5..44b87e5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -168,6 +168,9 @@ Release 2.8.0 - UNRELEASED
YARN-3511. Add errors and warnings page to ATS. (Varun Vasudev via xgong)
+YARN-3406. Display count of running containers in the RM's Web UI.
+(Ryu Kobayashi via ozawa)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4a3dabd9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index 5acabf5..6ca5011 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -24,10 +24,11 @@ import static
org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
public class WebPageUtils {
public static String appsTableInit() {
-return appsTableInit(false);
+return appsTableInit(false, true);
}
- public static String appsTableInit(boolean isFairSchedulerPage) {
+ public static String appsTableInit(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
// id, user, name, queue, starttime, finishtime, state, status, progress,
ui
// FairSchedulerPage's table is a bit different
return tableInit()
@@ -35,22 +36,30 @@ public class WebPageUtils {
.append(, bDeferRender: true)
.append(, bProcessing: true)
.append(\n, aoColumnDefs: )
- .append(getAppsTableColumnDefs(isFairSchedulerPage))
+ .append(getAppsTableColumnDefs(isFairSchedulerPage, isResourceManager))
// Sort by id upon page load
.append(, aaSorting: [[0, 'desc']]}).toString();
}
- private static String getAppsTableColumnDefs(boolean isFairSchedulerPage) {
+ private static String getAppsTableColumnDefs(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
StringBuilder sb = new StringBuilder();
-return sb
- .append([\n)
+sb.append([\n)
.append({'sType':'string', 'aTargets': [0])
.append(, 'mRender': parseHadoopID })
.append(\n, {'sType':'numeric', 'aTargets': +
(isFairSchedulerPage ? [6, 7]: [5, 6]))
.append(, 'mRender': renderHadoopDate })
- .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9])
- .append(, 'mRender': parseHadoopProgress }]).toString();
+ .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets':);
+if (isFairSchedulerPage) {
+ sb.append([11]);
+} else if (isResourceManager) {
+ sb.append([10]);
+} else {
+ sb.append([9]);
+}
+sb.append(, 'mRender': parseHadoopProgress }]);
+return sb.toString();
}
public static String attemptsTableInit() {
hadoop git commit: YARN-3406. Display count of running containers in the RM's Web UI. Contributed by Ryu Kobayashi.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 bd750f160 - 3884948d6
YARN-3406. Display count of running containers in the RM's Web UI. Contributed
by Ryu Kobayashi.
(cherry picked from commit 4a3dabd94fc39d7604b826065c23859d565f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3884948d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3884948d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3884948d
Branch: refs/heads/branch-2
Commit: 3884948d6c7045de9123e78d5ef00602d7d4410b
Parents: bd750f1
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Sat Apr 25 07:17:11 2015 +0900
Committer: Tsuyoshi Ozawa oz...@apache.org
Committed: Sat Apr 25 07:17:42 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/server/webapp/WebPageUtils.java | 25 +---
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 9 +++
.../webapp/FairSchedulerAppsBlock.java | 2 ++
.../webapp/FairSchedulerPage.java | 2 +-
.../resourcemanager/webapp/RMAppsBlock.java | 6 -
6 files changed, 37 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3884948d/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 14c419b..1f486e4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -120,6 +120,9 @@ Release 2.8.0 - UNRELEASED
YARN-3511. Add errors and warnings page to ATS. (Varun Vasudev via xgong)
+YARN-3406. Display count of running containers in the RM's Web UI.
+(Ryu Kobayashi via ozawa)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3884948d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index 5acabf5..6ca5011 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -24,10 +24,11 @@ import static
org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
public class WebPageUtils {
public static String appsTableInit() {
-return appsTableInit(false);
+return appsTableInit(false, true);
}
- public static String appsTableInit(boolean isFairSchedulerPage) {
+ public static String appsTableInit(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
// id, user, name, queue, starttime, finishtime, state, status, progress,
ui
// FairSchedulerPage's table is a bit different
return tableInit()
@@ -35,22 +36,30 @@ public class WebPageUtils {
.append(, bDeferRender: true)
.append(, bProcessing: true)
.append(\n, aoColumnDefs: )
- .append(getAppsTableColumnDefs(isFairSchedulerPage))
+ .append(getAppsTableColumnDefs(isFairSchedulerPage, isResourceManager))
// Sort by id upon page load
.append(, aaSorting: [[0, 'desc']]}).toString();
}
- private static String getAppsTableColumnDefs(boolean isFairSchedulerPage) {
+ private static String getAppsTableColumnDefs(
+ boolean isFairSchedulerPage, boolean isResourceManager) {
StringBuilder sb = new StringBuilder();
-return sb
- .append([\n)
+sb.append([\n)
.append({'sType':'string', 'aTargets': [0])
.append(, 'mRender': parseHadoopID })
.append(\n, {'sType':'numeric', 'aTargets': +
(isFairSchedulerPage ? [6, 7]: [5, 6]))
.append(, 'mRender': renderHadoopDate })
- .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9])
- .append(, 'mRender': parseHadoopProgress }]).toString();
+ .append(\n, {'sType':'numeric', bSearchable:false, 'aTargets':);
+if (isFairSchedulerPage) {
+ sb.append([11]);
+} else if (isResourceManager) {
+ sb.append([10]);
+} else {
+ sb.append([9]);
+}
+sb.append(, 'mRender': parseHadoopProgress }]);
+return sb.toString();
}
public static String attemptsTableInit() {
