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 na...@apache.org on 2017/09/03 23:55:50 UTC
[70/77] [abbrv] hadoop git commit: YARN-7120. CapacitySchedulerPage
NPE in "Aggregate scheduler counts" section. Contributed by Eric Payne
YARN-7120. CapacitySchedulerPage NPE in "Aggregate scheduler counts" section. Contributed by Eric Payne
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/99a7f5d4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/99a7f5d4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/99a7f5d4
Branch: refs/heads/yarn-3409
Commit: 99a7f5d451fb91ef956c926f891283f70f0ada1c
Parents: a3fee47
Author: Jason Lowe <jl...@apache.org>
Authored: Fri Sep 1 11:09:14 2017 -0500
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri Sep 1 11:09:14 2017 -0500
----------------------------------------------------------------------
.../server/resourcemanager/webapp/CapacitySchedulerPage.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99a7f5d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.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/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
index 93e1c97..3c00cb8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
@@ -556,8 +556,12 @@ class CapacitySchedulerPage extends RmView {
.$class("ui-state-default").__("Queue").__().__().__().tbody();
SchedulerHealth.DetailedInformation di = entry.getValue();
if (di.getTimestamp() != 0) {
- containerId = di.getContainerId().toString();
- nodeId = di.getNodeId().toString();
+ if (di.getContainerId() != null) {
+ containerId = di.getContainerId().toString();
+ }
+ if (di.getNodeId() != null) {
+ nodeId = di.getNodeId().toString();
+ }
queue = di.getQueue();
}
tbody.$class("ui-widget-content").tr()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org