Repository: hadoop Updated Branches: refs/heads/branch-2 c36090fd3 -> 896b8c655
YARN-3917. getResourceCalculatorPlugin for the default should intercept all exceptions. (gera) (cherry picked from commit d7319dee37ea93f1a1ba4153ea63ea8010ba2441) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/896b8c65 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/896b8c65 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/896b8c65 Branch: refs/heads/branch-2 Commit: 896b8c6551b1dd57c09caa2df0e46f9f9000179e Parents: c36090f Author: Gera Shegalov <[email protected]> Authored: Fri Jul 10 17:43:53 2015 -0700 Committer: Gera Shegalov <[email protected]> Committed: Sat Jul 11 22:41:04 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/896b8c65/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b25e700..6e027d2 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -568,6 +568,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/896b8c65/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; } }
