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 zj...@apache.org on 2015/06/03 20:53:07 UTC
hadoop git commit: YARN-3751. Fixed AppInfo to check if used
resources are null. Contributed by Sunil G.
Repository: hadoop
Updated Branches:
refs/heads/trunk c59e74563 -> dbc4f6493
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/dbc4f649
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dbc4f649
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dbc4f649
Branch: refs/heads/trunk
Commit: dbc4f64937ea2b4c941a3ac49afc4eeba3f5b763
Parents: c59e745
Author: Zhijie Shen <zj...@apache.org>
Authored: Wed Jun 3 11:51:41 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Wed Jun 3 11:51:41 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/dbc4f649/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 894508f..c5ba58c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -479,6 +479,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/dbc4f649/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()) {