Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2BEB0200C7D for ; Tue, 16 May 2017 16:28:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2A968160BAC; Tue, 16 May 2017 14:28:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7A0BA160B9D for ; Tue, 16 May 2017 16:28:27 +0200 (CEST) Received: (qmail 34433 invoked by uid 500); 16 May 2017 14:28:26 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 34418 invoked by uid 99); 16 May 2017 14:28:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 May 2017 14:28:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FA03DFDD5; Tue, 16 May 2017 14:28:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: <8eb28fcab6524a8a9475fcc74bc8f1c2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-6603. NPE in RMAppsBlock. Contributed by Jason Lowe Date: Tue, 16 May 2017 14:28:25 +0000 (UTC) archived-at: Tue, 16 May 2017 14:28:28 -0000 Repository: hadoop Updated Branches: refs/heads/trunk c48f2976a -> 489f85933 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/trunk Commit: 489f85933c508bc26de607b921e56e23b979fce8 Parents: c48f297 Author: Jason Lowe Authored: Tue May 16 09:26:44 2017 -0500 Committer: Jason Lowe 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 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 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-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org