YARN-6603. NPE in RMAppsBlock. Contributed by Jason Lowe
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/489f8593 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/489f8593 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/489f8593 Branch: refs/heads/YARN-5734 Commit: 489f85933c508bc26de607b921e56e23b979fce8 Parents: c48f297 Author: Jason Lowe <jl...@yahoo-inc.com> Authored: Tue May 16 09:26:44 2017 -0500 Committer: Jason Lowe <jl...@yahoo-inc.com> Committed: Tue May 16 09:26:44 2017 -0500 ---------------------------------------------------------------------- .../server/resourcemanager/webapp/RMAppsBlock.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/489f8593/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 305f1d5..6a18296 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 @@ -31,6 +31,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; import org.apache.hadoop.yarn.server.webapp.AppsBlock; import org.apache.hadoop.yarn.server.webapp.dao.AppInfo; @@ -96,13 +97,15 @@ public class RMAppsBlock extends AppsBlock { } String blacklistedNodesCount = "N/A"; - RMAppAttempt appAttempt = - rm.getRMContext().getRMApps().get(appAttemptId.getApplicationId()) - .getAppAttempts().get(appAttemptId); - Set<String> nodes = - null == appAttempt ? null : appAttempt.getBlacklistedNodes(); - if (nodes != null) { - blacklistedNodesCount = String.valueOf(nodes.size()); + RMApp rmApp = rm.getRMContext().getRMApps() + .get(appAttemptId.getApplicationId()); + if (rmApp != null) { + RMAppAttempt appAttempt = rmApp.getRMAppAttempt(appAttemptId); + Set<String> nodes = + null == appAttempt ? null : appAttempt.getBlacklistedNodes(); + if (nodes != null) { + blacklistedNodesCount = String.valueOf(nodes.size()); + } } String percent = StringUtils.format("%.1f", app.getProgress()); appsTableData --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
