Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A5DCB18558 for ; Thu, 25 Feb 2016 02:39:35 +0000 (UTC) Received: (qmail 14424 invoked by uid 500); 25 Feb 2016 02:39:35 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 14359 invoked by uid 500); 25 Feb 2016 02:39:35 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 14339 invoked by uid 99); 25 Feb 2016 02:39:35 -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; Thu, 25 Feb 2016 02:39:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3086CE8ECD; Thu, 25 Feb 2016 02:39:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kasha@apache.org To: common-commits@hadoop.apache.org Message-Id: <6ca5e4b0d574491e9d1f708660a3703a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4729. SchedulerApplicationAttempt#getTotalRequiredResources can throw an NPE. (kasha) Date: Thu, 25 Feb 2016 02:39:35 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 4892f6a0e -> 6a75c5af0 YARN-4729. SchedulerApplicationAttempt#getTotalRequiredResources can throw an NPE. (kasha) (cherry picked from commit c684f2b007a4808dafbe1c1d3ce01758e281d329) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6a75c5af Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6a75c5af Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6a75c5af Branch: refs/heads/branch-2 Commit: 6a75c5af09fc1126a5406fec91da75011ca20c06 Parents: 4892f6a Author: Karthik Kambatla Authored: Wed Feb 24 18:33:57 2016 -0800 Committer: Karthik Kambatla Committed: Wed Feb 24 18:34:21 2016 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/scheduler/SchedulerApplicationAttempt.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6a75c5af/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 89da408..ce2125b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -166,6 +166,9 @@ Release 2.9.0 - UNRELEASED YARN-4651. Document movetoqueue option in 'YARN Commands' (Takashi Ohnishi via rohithsharmaks) + YARN-4729. SchedulerApplicationAttempt#getTotalRequiredResources can throw + an NPE. (kasha) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6a75c5af/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.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/scheduler/SchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java index 0cbb88d..2542009 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java @@ -244,7 +244,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity { } public synchronized int getTotalRequiredResources(Priority priority) { - return getResourceRequest(priority, ResourceRequest.ANY).getNumContainers(); + ResourceRequest request = getResourceRequest(priority, ResourceRequest.ANY); + return request == null ? 0 : request.getNumContainers(); } public synchronized Resource getResource(Priority priority) {