From common-commits-return-92759-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Thu Jan 24 19:55:23 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 15E8B18077A for ; Thu, 24 Jan 2019 19:55:22 +0100 (CET) Received: (qmail 74312 invoked by uid 500); 24 Jan 2019 18:55:21 -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 74087 invoked by uid 99); 24 Jan 2019 18:55:21 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2019 18:55:21 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2565585541; Thu, 24 Jan 2019 18:55:21 +0000 (UTC) Date: Thu, 24 Jan 2019 18:55:22 +0000 To: "common-commits@hadoop.apache.org" Subject: [hadoop] 03/04: YARN-9175. Null resources check in ResourceInfo for branch-3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: jhung@apache.org In-Reply-To: <154835611934.32059.16390375752839248257@gitbox.apache.org> References: <154835611934.32059.16390375752839248257@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: hadoop X-Git-Refname: refs/heads/YARN-8200 X-Git-Reftype: branch X-Git-Rev: e6161e4022f342dab571b118faee032bbe1ecb2e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190124185521.2565585541@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. jhung pushed a commit to branch YARN-8200 in repository https://gitbox.apache.org/repos/asf/hadoop.git commit e6161e4022f342dab571b118faee032bbe1ecb2e Author: Jonathan Hung AuthorDate: Thu Jan 3 15:58:10 2019 -0500 YARN-9175. Null resources check in ResourceInfo for branch-3.0 (cherry picked from commit a0291a015c1af0ea1282849bd8fb32824d7452fa) --- .../hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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/dao/ResourceInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java index e13980a..dd80d20 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java @@ -62,7 +62,7 @@ public class ResourceInfo { @Override public String toString() { - return resources.toString(); + return getResource().toString(); } public void setMemory(int memory) { @@ -82,6 +82,9 @@ public class ResourceInfo { } public Resource getResource() { + if (resources == null) { + resources = Resource.newInstance(memory, vCores); + } return Resource.newInstance(resources); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org