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 2574218F8A for ; Mon, 13 Jul 2015 17:30:43 +0000 (UTC) Received: (qmail 6769 invoked by uid 500); 13 Jul 2015 17:26:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 1181 invoked by uid 500); 13 Jul 2015 17:26:41 -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 92211 invoked by uid 99); 13 Jul 2015 17:13:47 -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; Mon, 13 Jul 2015 17:13:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2F68E05D6; Mon, 13 Jul 2015 17:13:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Date: Mon, 13 Jul 2015 17:13:49 -0000 Message-Id: In-Reply-To: <7d77e3e4d6d34a929be1db11dc2b21d1@git.apache.org> References: <7d77e3e4d6d34a929be1db11dc2b21d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/9] hadoop git commit: YARN-3917. getResourceCalculatorPlugin for the default should intercept all exceptions. (gera) YARN-3917. getResourceCalculatorPlugin for the default should intercept all exceptions. (gera) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d7319dee Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d7319dee Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d7319dee Branch: refs/heads/HADOOP-12111 Commit: d7319dee37ea93f1a1ba4153ea63ea8010ba2441 Parents: 1df39c1 Author: Gera Shegalov Authored: Fri Jul 10 17:43:53 2015 -0700 Committer: Gera Shegalov Committed: Sat Jul 11 22:29:36 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/util/ResourceCalculatorPlugin.java | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7319dee/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1365747..9881771 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -616,6 +616,9 @@ Release 2.8.0 - UNRELEASED YARN-3849. Too much of preemption activity causing continuos killing of containers across queues. (Sunil G via wangda) + YARN-3917. getResourceCalculatorPlugin for the default should intercept all + exceptions. (gera) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7319dee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java index 21724a9..3af4aee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java @@ -17,6 +17,8 @@ */ package org.apache.hadoop.yarn.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -30,6 +32,8 @@ import org.apache.hadoop.util.SysInfo; @InterfaceAudience.LimitedPrivate({"YARN", "MAPREDUCE"}) @InterfaceStability.Unstable public class ResourceCalculatorPlugin extends Configured { + private static final Log LOG = + LogFactory.getLog(ResourceCalculatorPlugin.class); private final SysInfo sys; @@ -158,9 +162,10 @@ public class ResourceCalculatorPlugin extends Configured { } try { return new ResourceCalculatorPlugin(); - } catch (SecurityException e) { - return null; + } catch (Throwable t) { + LOG.warn(t + ": Failed to instantiate default resource calculator.", t); } + return null; } }