commit 0604cc0ee05b2a43d5a9885b47760ba63c18e29e Author: Gera Shegalov Date: Fri Jul 10 17:43:53 2015 -0700 HADOOP-12222.001.patch 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 @@ @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 static ResourceCalculatorPlugin getResourceCalculatorPlugin( } try { return new ResourceCalculatorPlugin(); - } catch (SecurityException e) { - return null; + } catch (Throwable t) { + LOG.warn(t + ": Failed to instantiate default resource calculator.", t); } + return null; } }