Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3917. getResourceCalculatorPlugin for the default should intercept all exceptions. (gera) 

(cherry picked from commit d7319dee37)
This commit is contained in:
Gera Shegalov 2015-07-10 17:43:53 -07:00
parent c36090fd3f
commit 896b8c6551
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -568,6 +568,9 @@ Release 2.8.0 - UNRELEASED
YARN-3849. Too much of preemption activity causing continuos killing of YARN-3849. Too much of preemption activity causing continuos killing of
containers across queues. (Sunil G via wangda) containers across queues. (Sunil G via wangda)
YARN-3917. getResourceCalculatorPlugin for the default should intercept all
exceptions. (gera)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java
View File

@ -17,6 +17,8 @@
*/ */
package org.apache.hadoop.yarn.util; 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.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -30,6 +32,8 @@ import org.apache.hadoop.util.SysInfo;
@InterfaceAudience.LimitedPrivate({"YARN", "MAPREDUCE"}) @InterfaceAudience.LimitedPrivate({"YARN", "MAPREDUCE"})
@InterfaceStability.Unstable @InterfaceStability.Unstable
public class ResourceCalculatorPlugin extends Configured { public class ResourceCalculatorPlugin extends Configured {
private static final Log LOG =
LogFactory.getLog(ResourceCalculatorPlugin.class);
private final SysInfo sys; private final SysInfo sys;
@ -158,9 +162,10 @@ public class ResourceCalculatorPlugin extends Configured {
} }
try { try {
return new ResourceCalculatorPlugin(); return new ResourceCalculatorPlugin();
} catch (SecurityException e) { } catch (Throwable t) {
return null; LOG.warn(t + ": Failed to instantiate default resource calculator.", t);
} }
return null;
} }
} }