YARN-3751. Fixed AppInfo to check if used resources are null. Contributed by Sunil G.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/91a3b9f0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/91a3b9f0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/91a3b9f0 Branch: refs/heads/YARN-2928 Commit: 91a3b9f0389610e31e243df0541f9e8cd8d5de87 Parents: dadcb31 Author: Zhijie Shen <zjs...@apache.org> Authored: Wed Jun 3 11:51:41 2015 -0700 Committer: Zhijie Shen <zjs...@apache.org> Committed: Mon Jun 8 09:43:13 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/server/webapp/dao/AppInfo.java | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/91a3b9f0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a19ba88..21618c7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -570,6 +570,9 @@ Release 2.8.0 - UNRELEASED YARN-3740. Fixed the typo in the configuration name: APPLICATION_HISTORY_PREFIX_MAX_APPS. (Xuan Gong via zjshen) + YARN-3751. Fixed AppInfo to check if used resources are null. (Sunil G via + zjshen) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/91a3b9f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.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/dao/AppInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java index 0cc5f75..8f332a4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java @@ -86,12 +86,14 @@ public class AppInfo { elapsedTime = Times.elapsed(startedTime, finishedTime); finalAppStatus = app.getFinalApplicationStatus(); if (app.getApplicationResourceUsageReport() != null) { - runningContainers = - app.getApplicationResourceUsageReport().getNumUsedContainers(); - allocatedCpuVcores = app.getApplicationResourceUsageReport() - .getUsedResources().getVirtualCores(); - allocatedMemoryMB = app.getApplicationResourceUsageReport() - .getUsedResources().getMemory(); + runningContainers = app.getApplicationResourceUsageReport() + .getNumUsedContainers(); + if (app.getApplicationResourceUsageReport().getUsedResources() != null) { + allocatedCpuVcores = app.getApplicationResourceUsageReport() + .getUsedResources().getVirtualCores(); + allocatedMemoryMB = app.getApplicationResourceUsageReport() + .getUsedResources().getMemory(); + } } progress = app.getProgress() * 100; // in percent if (app.getApplicationTags() != null && !app.getApplicationTags().isEmpty()) {
