diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java index 528b6421a3f..ebe8bd011f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java @@ -21,8 +21,6 @@ import java.net.InetSocketAddress; import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.HadoopIllegalArgumentException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; @@ -30,10 +28,12 @@ import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @InterfaceAudience.Private public class HAUtil { - private static Log LOG = LogFactory.getLog(HAUtil.class); + private static Logger LOG = LoggerFactory.getLogger(HAUtil.class); @VisibleForTesting public static final String BAD_CONFIG_MESSAGE_PREFIX = diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java index 3a09de5d6ba..fdba297f7e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java @@ -20,8 +20,6 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes; import org.apache.hadoop.yarn.api.records.Resource; @@ -32,6 +30,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.FileNotFoundException; import java.io.IOException; @@ -66,7 +66,7 @@ private static volatile Map readOnlyNodeResources; private static volatile int numKnownResourceTypes = -1; - static final Log LOG = LogFactory.getLog(ResourceUtils.class); + static final Logger LOG = LoggerFactory.getLogger(ResourceUtils.class); private ResourceUtils() { } @@ -393,11 +393,11 @@ private static void addResourcesFileToConf(String resourceFile, } catch (FileNotFoundException fe) { throw fe; } catch (IOException ie) { - LOG.fatal("Exception trying to read resource types configuration '" + LOG.error("Exception trying to read resource types configuration '" + resourceFile + "'.", ie); throw new YarnRuntimeException(ie); } catch (YarnException ye) { - LOG.fatal("YARN Exception trying to read resource types configuration '" + LOG.error("YARN Exception trying to read resource types configuration '" + resourceFile + "'.", ye); throw new YarnRuntimeException(ye); }