Repository: hadoop Updated Branches: refs/heads/branch-2 01bdfd794 -> 0f30913ea
YARN-3552. RM Web UI shows -1 running containers for completed apps. Contributed by Rohith (cherry picked from commit 9356cf8676fd18f78655e8a6f2e6c946997dbd40) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f30913e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f30913e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f30913e Branch: refs/heads/branch-2 Commit: 0f30913ea8167e1191036cb47cfaeff3aedc6a2e Parents: 01bdfd7 Author: Jason Lowe <jl...@apache.org> Authored: Tue May 5 13:42:32 2015 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Tue May 5 13:43:57 2015 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/webapp/FairSchedulerAppsBlock.java | 3 ++- .../hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f30913e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index f9eb34c..9f7af1e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -260,6 +260,9 @@ Release 2.8.0 - UNRELEASED YARN-2725. Added test cases of retrying creating znode in ZKRMStateStore. (Tsuyoshi Ozawa via jianhe) + YARN-3552. RM Web UI shows -1 running containers for completed apps + (Rohith via jlowe) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f30913e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java index 9650dfe..8f8ece0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java @@ -133,7 +133,8 @@ public class FairSchedulerAppsBlock extends HtmlBlock { .append(appInfo.getFinishTime()).append("\",\"") .append(appInfo.getState()).append("\",\"") .append(appInfo.getFinalStatus()).append("\",\"") - .append(appInfo.getRunningContainers()).append("\",\"") + .append(appInfo.getRunningContainers() == -1 ? "N/A" : String + .valueOf(appInfo.getRunningContainers())).append("\",\"") // Progress bar .append("<br title='").append(percent) .append("'> <div class='").append(C_PROGRESSBAR).append("' title='") http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f30913e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java index 715d9d9..3054150 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java @@ -110,7 +110,8 @@ public class RMAppsBlock extends AppsBlock { .append("\",\"") .append(app.getFinalAppStatus()) .append("\",\"") - .append(String.valueOf(app.getRunningContainers())) + .append(app.getRunningContainers() == -1 ? "N/A" : String + .valueOf(app.getRunningContainers())) .append("\",\"") // Progress bar .append("<br title='").append(percent).append("'> <div class='")