From 4de7a9fe0b3ebd31106a7b8c6fc08d8d1d4698f1 Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Sun, 3 Mar 2019 15:56:58 +0530 Subject: [PATCH] YARN-7477 --- .../yarn/FileSystemBasedConfigurationProvider.java | 8 +- .../hadoop/yarn/YarnUncaughtExceptionHandler.java | 14 ++- .../yarn/api/records/impl/pb/ResourcePBImpl.java | 7 +- .../org/apache/hadoop/yarn/client/AHSProxy.java | 7 +- .../apache/hadoop/yarn/client/ClientRMProxy.java | 7 +- .../client/ConfiguredRMFailoverProxyProvider.java | 8 +- .../org/apache/hadoop/yarn/client/RMProxy.java | 7 +- .../RequestHedgingRMFailoverProxyProvider.java | 8 +- .../yarn/client/api/impl/DirectTimelineWriter.java | 8 +- .../client/api/impl/FileSystemTimelineWriter.java | 18 +-- .../yarn/client/api/impl/TimelineClientImpl.java | 7 +- .../yarn/client/api/impl/TimelineConnector.java | 7 +- .../client/api/impl/TimelineReaderClientImpl.java | 8 +- .../yarn/client/api/impl/TimelineV2ClientImpl.java | 7 +- .../yarn/client/api/impl/TimelineWriter.java | 8 +- .../apache/hadoop/yarn/event/AsyncDispatcher.java | 13 ++- .../apache/hadoop/yarn/event/EventDispatcher.java | 13 ++- .../factories/impl/pb/RpcClientFactoryPBImpl.java | 8 +- .../factories/impl/pb/RpcServerFactoryPBImpl.java | 7 +- .../apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java | 7 +- .../java/org/apache/hadoop/yarn/ipc/YarnRPC.java | 7 +- .../AggregatedLogDeletionService.java | 7 +- .../LogAggregationFileControllerFactory.java | 6 +- .../tfile/LogAggregationTFileController.java | 6 +- .../yarn/nodelabels/CommonNodeLabelsManager.java | 7 +- .../yarn/nodelabels/FileSystemNodeLabelsStore.java | 8 +- .../nodelabels/NonAppendableFSNodeLabelStore.java | 8 +- .../yarn/nodelabels/store/AbstractFSNodeStore.java | 7 +- .../hadoop/yarn/security/AMRMTokenIdentifier.java | 7 +- .../hadoop/yarn/security/AMRMTokenSelector.java | 8 +- .../hadoop/yarn/security/AdminACLsManager.java | 7 +- .../yarn/security/ContainerTokenIdentifier.java | 7 +- .../yarn/security/ContainerTokenSelector.java | 8 +- .../hadoop/yarn/security/NMTokenIdentifier.java | 7 +- .../hadoop/yarn/security/NMTokenSelector.java | 8 +- .../yarn/security/YarnAuthorizationProvider.java | 7 +- .../security/client/ClientToAMTokenSelector.java | 8 +- .../security/client/RMDelegationTokenSelector.java | 8 +- .../client/TimelineDelegationTokenSelector.java | 8 +- .../server/security/ApplicationACLsManager.java | 8 +- .../yarn/util/AbstractLivelinessMonitor.java | 7 +- .../apache/hadoop/yarn/util/AdHocLogDumper.java | 123 +++++++++++---------- .../org/apache/hadoop/yarn/util/FSDownload.java | 7 +- .../hadoop/yarn/util/ProcfsBasedProcessTree.java | 18 +-- .../hadoop/yarn/util/ResourceCalculatorPlugin.java | 8 +- .../yarn/util/ResourceCalculatorProcessTree.java | 8 +- .../java/org/apache/hadoop/yarn/util/Times.java | 7 +- .../hadoop/yarn/util/WindowsBasedProcessTree.java | 8 +- .../apache/hadoop/yarn/util/YarnVersionInfo.java | 7 +- .../util/resource/DefaultResourceCalculator.java | 8 +- .../util/resource/DominantResourceCalculator.java | 7 +- .../hadoop/yarn/util/resource/Resources.java | 8 +- .../yarn/webapp/GenericExceptionHandler.java | 8 +- .../apache/hadoop/yarn/TestContainerLaunchRPC.java | 9 +- .../yarn/TestContainerResourceIncreaseRPC.java | 8 +- .../hadoop/yarn/api/BasePBImplRecordsTest.java | 7 +- .../api/records/timeline/TestTimelineRecords.java | 8 +- .../TestTimelineServiceRecords.java | 8 +- .../api/impl/TestTimelineClientForATS1_5.java | 8 +- .../client/api/impl/TestTimelineClientV2Impl.java | 8 +- .../apache/hadoop/yarn/event/InlineDispatcher.java | 7 +- .../logaggregation/TestAggregatedLogFormat.java | 8 +- .../hadoop/yarn/util/TestAdHocLogDumper.java | 31 +++--- .../apache/hadoop/yarn/util/TestFSDownload.java | 7 +- .../util/TestLog4jWarningErrorMetricsAppender.java | 21 ++-- .../yarn/util/TestProcfsBasedProcessTree.java | 8 +- .../apache/hadoop/yarn/util/TestRackResolver.java | 7 +- .../yarn/util/TestWindowsBasedProcessTree.java | 8 +- 68 files changed, 377 insertions(+), 324 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java index 73c4990..b6ba660 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -37,8 +37,8 @@ public class FileSystemBasedConfigurationProvider extends ConfigurationProvider { - private static final Log LOG = LogFactory - .getLog(FileSystemBasedConfigurationProvider.class); + private static final Logger LOG = LoggerFactory + .getLogger(FileSystemBasedConfigurationProvider.class); private FileSystem fs; private Path configDir; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java index 7b4b774..d2ca6f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java @@ -20,8 +20,10 @@ import java.lang.Thread.UncaughtExceptionHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.util.ExitUtil; @@ -39,7 +41,10 @@ @Public @Evolving public class YarnUncaughtExceptionHandler implements UncaughtExceptionHandler { - private static final Log LOG = LogFactory.getLog(YarnUncaughtExceptionHandler.class); + private static final Logger LOG = + LoggerFactory.getLogger(YarnUncaughtExceptionHandler.class); + private static final Marker FATAL = + MarkerFactory.getMarker("FATAL"); @Override public void uncaughtException(Thread t, Throwable e) { @@ -48,7 +53,8 @@ public void uncaughtException(Thread t, Throwable e) { "down, so ignoring this", e); } else if(e instanceof Error) { try { - LOG.fatal("Thread " + t + " threw an Error. Shutting down now...", e); + LOG.error(FATAL, + "Thread " + t + " threw an Error. Shutting down now...", e); } catch (Throwable err) { //We don't want to not exit because of an issue with logging } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java index 076a49d..36fc959 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java @@ -20,8 +20,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes; @@ -41,7 +41,8 @@ @Unstable public class ResourcePBImpl extends Resource { - private static final Log LOG = LogFactory.getLog(ResourcePBImpl.class); + private static final Logger LOG = + LoggerFactory.getLogger(ResourcePBImpl.class); ResourceProto proto = ResourceProto.getDefaultInstance(); ResourceProto.Builder builder = null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java index d523487..e2978b7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java @@ -22,8 +22,8 @@ import java.net.InetSocketAddress; import java.security.PrivilegedAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -35,7 +35,8 @@ @SuppressWarnings("unchecked") public class AHSProxy { - private static final Log LOG = LogFactory.getLog(AHSProxy.class); + private static final Logger LOG = + LoggerFactory.getLogger(AHSProxy.class); public static T createAHSProxy(final Configuration conf, final Class protocol, InetSocketAddress ahsAddress) throws IOException { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java index 5b028e1..496b984 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java @@ -22,8 +22,8 @@ import java.net.InetSocketAddress; import java.util.ArrayList; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability; @@ -47,7 +47,8 @@ @InterfaceAudience.Public @InterfaceStability.Stable public class ClientRMProxy extends RMProxy { - private static final Log LOG = LogFactory.getLog(ClientRMProxy.class); + private static final Logger LOG = + LoggerFactory.getLogger(ClientRMProxy.class); private interface ClientRMProtocols extends ApplicationClientProtocol, ApplicationMasterProtocol, ResourceManagerAdministrationProtocol { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java index d6b6cce..89c8753 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -39,8 +39,8 @@ @InterfaceStability.Unstable public class ConfiguredRMFailoverProxyProvider implements RMFailoverProxyProvider { - private static final Log LOG = - LogFactory.getLog(ConfiguredRMFailoverProxyProvider.class); + private static final Logger LOG = + LoggerFactory.getLogger(ConfiguredRMFailoverProxyProvider.class); private int currentProxyIndex = 0; Map proxies = new HashMap(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java index f7cb47a..d385d3e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability; @@ -56,7 +56,8 @@ @SuppressWarnings("unchecked") public class RMProxy { - private static final Log LOG = LogFactory.getLog(RMProxy.class); + private static final Logger LOG = + LoggerFactory.getLogger(RMProxy.class); private UserGroupInformation user; protected RMProxy() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java index c1e9da1..d4c7f6f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java @@ -34,8 +34,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.retry.RetryPolicy; import org.apache.hadoop.io.retry.RetryProxy; @@ -55,8 +55,8 @@ public class RequestHedgingRMFailoverProxyProvider extends ConfiguredRMFailoverProxyProvider { - private static final Log LOG = - LogFactory.getLog(RequestHedgingRMFailoverProxyProvider.class); + private static final Logger LOG = + LoggerFactory.getLogger(RequestHedgingRMFailoverProxyProvider.class); private volatile String successfulProxy = null; private ProxyInfo wrappedProxy = null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java index abc2a28..7fea1db 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.net.URI; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.security.UserGroupInformation; @@ -42,8 +42,8 @@ @Unstable public class DirectTimelineWriter extends TimelineWriter{ - private static final Log LOG = LogFactory - .getLog(DirectTimelineWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(DirectTimelineWriter.class); public DirectTimelineWriter(UserGroupInformation authUgi, Client client, URI resURI) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java index c00a0b8..bc5e987 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java @@ -38,8 +38,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -78,8 +78,8 @@ @Unstable public class FileSystemTimelineWriter extends TimelineWriter{ - private static final Log LOG = LogFactory - .getLog(FileSystemTimelineWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(FileSystemTimelineWriter.class); // App log directory must be readable by group so server can access logs // and writable by group so it can be deleted by server @@ -267,7 +267,7 @@ public synchronized void close() throws Exception { LOG.debug("Closing cache"); logFDsCache.flush(); } - IOUtils.cleanup(LOG, logFDsCache, fs); + IOUtils.cleanupWithLogger(LOG, logFDsCache, fs); } @Override @@ -355,8 +355,8 @@ public LogFD(FileSystem fs, Path logPath, ObjectMapper objMapper, public void close() { if (stream != null) { - IOUtils.cleanup(LOG, jsonGenerator); - IOUtils.cleanup(LOG, stream); + IOUtils.cleanupWithLogger(LOG, jsonGenerator); + IOUtils.cleanupWithLogger(LOG, stream); stream = null; jsonGenerator = null; } @@ -559,7 +559,7 @@ public void run() { flush(); } catch (Exception e) { if (LOG.isDebugEnabled()) { - LOG.debug(e); + LOG.debug(e.toString()); } } } @@ -636,7 +636,7 @@ public void run() { try { cleanInActiveFDs(); } catch (Exception e) { - LOG.warn(e); + LOG.warn(e.toString()); } } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java index 88fccd9..7eb4ec1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java @@ -28,8 +28,8 @@ import org.apache.commons.cli.GnuParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.conf.Configuration; @@ -58,7 +58,8 @@ @Evolving public class TimelineClientImpl extends TimelineClient { - private static final Log LOG = LogFactory.getLog(TimelineClientImpl.class); + private static final Logger LOG = + LoggerFactory.getLogger(TimelineClientImpl.class); private static final ObjectMapper MAPPER = new ObjectMapper(); private static final String RESOURCE_URI_STR_V1 = "/ws/v1/timeline/"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java index 9d084d7..ca0f307 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java @@ -34,8 +34,8 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; @@ -73,7 +73,8 @@ public class TimelineConnector extends AbstractService { private static final Joiner JOINER = Joiner.on(""); - private static final Log LOG = LogFactory.getLog(TimelineConnector.class); + private static final Logger LOG = + LoggerFactory.getLogger(TimelineConnector.class); public final static int DEFAULT_SOCKET_TIMEOUT = 1 * 60 * 1000; // 1 minute private SSLFactory sslFactory; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java index db53f93..475864e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java @@ -19,8 +19,8 @@ import com.google.common.annotations.VisibleForTesting; import com.sun.jersey.core.util.MultivaluedMapImpl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -53,8 +53,8 @@ @InterfaceAudience.Public @InterfaceStability.Evolving public class TimelineReaderClientImpl extends TimelineReaderClient { - private static final Log LOG = - LogFactory.getLog(TimelineReaderClientImpl.class); + private static final Logger LOG = + LoggerFactory.getLogger(TimelineReaderClientImpl.class); private static final String RESOURCE_URI_STR_V2 = "/ws/v2/timeline/"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java index c7c6587..e086e27 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java @@ -36,8 +36,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; @@ -64,7 +64,8 @@ * */ public class TimelineV2ClientImpl extends TimelineV2Client { - private static final Log LOG = LogFactory.getLog(TimelineV2ClientImpl.class); + private static final Logger LOG = + LoggerFactory.getLogger(TimelineV2ClientImpl.class); private static final String RESOURCE_URI_STR_V2 = "/ws/v2/timeline/"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java index b3a886b..f52479d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java @@ -26,8 +26,8 @@ import java.security.PrivilegedExceptionAction; import javax.ws.rs.core.MediaType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.security.UserGroupInformation; @@ -52,8 +52,8 @@ @Unstable public abstract class TimelineWriter implements Flushable { - private static final Log LOG = LogFactory - .getLog(TimelineWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(TimelineWriter.class); private UserGroupInformation authUgi; private Client client; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java index 4a78a22..333faa5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java @@ -25,8 +25,10 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.service.AbstractService; @@ -46,7 +48,10 @@ @Evolving public class AsyncDispatcher extends AbstractService implements Dispatcher { - private static final Log LOG = LogFactory.getLog(AsyncDispatcher.class); + private static final Logger LOG = + LoggerFactory.getLogger(AsyncDispatcher.class); + private static final Marker FATAL = + MarkerFactory.getMarker("FATAL"); private final BlockingQueue eventQueue; private volatile int lastEventQueueSizeLogged = 0; @@ -200,7 +205,7 @@ protected void dispatch(Event event) { } } catch (Throwable t) { //TODO Maybe log the state of the queue - LOG.fatal("Error in dispatcher thread", t); + LOG.error(FATAL, "Error in dispatcher thread", t); // If serviceStop is called, we should exit this thread gracefully. if (exitOnDispatchException && (ShutdownHookManager.get().isShutdownInProgress()) == false diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java index 7c7a87b..ccd8e2e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java @@ -19,8 +19,10 @@ package org.apache.hadoop.yarn.event; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.util.ShutdownHookManager; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; @@ -46,7 +48,10 @@ private volatile boolean stopped = false; private boolean shouldExitOnError = true; - private static final Log LOG = LogFactory.getLog(EventDispatcher.class); + private static final Logger LOG = + LoggerFactory.getLogger(EventDispatcher.class); + private static final Marker FATAL = + MarkerFactory.getMarker("FATAL"); private final class EventProcessor implements Runnable { @Override @@ -72,7 +77,7 @@ public void run() { LOG.warn("Exception during shutdown: ", t); break; } - LOG.fatal("Error in handling event type " + event.getType() + LOG.error(FATAL, "Error in handling event type " + event.getType() + " to the Event Dispatcher", t); if (shouldExitOnError && !ShutdownHookManager.get().isShutdownInProgress()) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java index 07c5e23..c28ea33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java @@ -27,8 +27,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.HadoopIllegalArgumentException; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; @@ -38,8 +38,8 @@ @Private public class RpcClientFactoryPBImpl implements RpcClientFactory { - private static final Log LOG = LogFactory - .getLog(RpcClientFactoryPBImpl.class); + private static final Logger LOG = LoggerFactory + .getLogger(RpcClientFactoryPBImpl.class); private static final String PB_IMPL_PACKAGE_SUFFIX = "impl.pb.client"; private static final String PB_IMPL_CLASS_SUFFIX = "PBClientImpl"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java index ec9a5f2..677850c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java @@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ipc.ProtobufRpcEngine; @@ -43,7 +43,8 @@ @Private public class RpcServerFactoryPBImpl implements RpcServerFactory { - private static final Log LOG = LogFactory.getLog(RpcServerFactoryPBImpl.class); + private static final Logger LOG = + LoggerFactory.getLogger(RpcServerFactoryPBImpl.class); private static final String PROTO_GEN_PACKAGE_NAME = "org.apache.hadoop.yarn.proto"; private static final String PROTO_GEN_CLASS_SUFFIX = "Service"; private static final String PB_IMPL_PACKAGE_SUFFIX = "impl.pb.service"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java index 040917d..d9d999f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java @@ -20,8 +20,8 @@ import java.net.InetSocketAddress; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ipc.Server; @@ -39,7 +39,8 @@ @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" }) public class HadoopYarnProtoRPC extends YarnRPC { - private static final Log LOG = LogFactory.getLog(HadoopYarnProtoRPC.class); + private static final Logger LOG = + LoggerFactory.getLogger(HadoopYarnProtoRPC.class); @Override public Object getProxy(Class protocol, InetSocketAddress addr, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java index 7f9fb77..436445f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java @@ -20,8 +20,8 @@ import java.net.InetSocketAddress; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ipc.Server; @@ -35,7 +35,8 @@ */ @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" }) public abstract class YarnRPC { - private static final Log LOG = LogFactory.getLog(YarnRPC.class); + private static final Logger LOG = + LoggerFactory.getLogger(YarnRPC.class); public abstract Object getProxy(Class protocol, InetSocketAddress addr, Configuration conf); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java index 841b870..90395aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java @@ -22,8 +22,8 @@ import java.util.Timer; import java.util.TimerTask; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; @@ -50,7 +50,8 @@ */ @InterfaceAudience.LimitedPrivate({"yarn", "mapreduce"}) public class AggregatedLogDeletionService extends AbstractService { - private static final Log LOG = LogFactory.getLog(AggregatedLogDeletionService.class); + private static final Logger LOG = + LoggerFactory.getLogger(AggregatedLogDeletionService.class); private Timer timer = null; private long checkIntervalMsecs; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java index cf40209..8339c1a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -51,7 +51,7 @@ @Unstable public class LogAggregationFileControllerFactory { - private static final Log LOG = LogFactory.getLog( + private static final Logger LOG = LoggerFactory.getLogger( LogAggregationFileControllerFactory.class); private final Pattern p = Pattern.compile( "^[A-Za-z_]+[A-Za-z0-9_]*$"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java index b3103d2..108595b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java @@ -27,8 +27,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.commons.math3.util.Pair; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; @@ -67,7 +67,7 @@ public class LogAggregationTFileController extends LogAggregationFileController { - private static final Log LOG = LogFactory.getLog( + private static final Logger LOG = LoggerFactory.getLogger( LogAggregationTFileController.class); private LogWriter writer; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java index 19254c1..e5b3d63 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java @@ -37,8 +37,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.AbstractService; @@ -63,7 +63,8 @@ @Private public class CommonNodeLabelsManager extends AbstractService { - protected static final Log LOG = LogFactory.getLog(CommonNodeLabelsManager.class); + protected static final Logger LOG = + LoggerFactory.getLogger(CommonNodeLabelsManager.class); public static final Set EMPTY_STRING_SET = Collections .unmodifiableSet(new HashSet(0)); public static final Set EMPTY_NODELABEL_SET = Collections diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java index 6c459c2..32e2268 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.nodelabels; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; @@ -46,8 +46,8 @@ public class FileSystemNodeLabelsStore extends AbstractFSNodeStore implements NodeLabelsStore { - protected static final Log LOG = - LogFactory.getLog(FileSystemNodeLabelsStore.class); + protected static final Logger LOG = + LoggerFactory.getLogger(FileSystemNodeLabelsStore.class); protected static final String DEFAULT_DIR_NAME = "node-labels"; protected static final String MIRROR_FILENAME = "nodelabel.mirror"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java index 6747037..9e90f33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.nodelabels; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.Path; import org.apache.hadoop.yarn.api.records.NodeId; @@ -39,8 +39,8 @@ * Store implementation for Non Appendable File Store. */ public class NonAppendableFSNodeLabelStore extends FileSystemNodeLabelsStore { - protected static final Log - LOG = LogFactory.getLog(NonAppendableFSNodeLabelStore.class); + protected static final Logger LOG = + LoggerFactory.getLogger(NonAppendableFSNodeLabelStore.class); @Override public void close() throws IOException { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java index 7127d11..d0fb837 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.yarn.nodelabels.store; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -40,7 +40,8 @@ */ public abstract class AbstractFSNodeStore { - protected static final Log LOG = LogFactory.getLog(AbstractFSNodeStore.class); + protected static final Logger LOG = + LoggerFactory.getLogger(AbstractFSNodeStore.class); private StoreType storeType; private FSDataOutputStream editlogOs; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java index ed83b06..591c09f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java @@ -25,8 +25,8 @@ import java.io.IOException; import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; @@ -51,7 +51,8 @@ @Evolving public class AMRMTokenIdentifier extends TokenIdentifier { - private static final Log LOG = LogFactory.getLog(AMRMTokenIdentifier.class); + private static final Logger LOG = + LoggerFactory.getLogger(AMRMTokenIdentifier.class); public static final Text KIND_NAME = new Text("YARN_AM_RM_TOKEN"); private AMRMTokenIdentifierProto proto; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java index be3701d..a041334 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java @@ -20,8 +20,8 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.io.Text; @@ -34,8 +34,8 @@ public class AMRMTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory - .getLog(AMRMTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(AMRMTokenSelector.class); @SuppressWarnings("unchecked") public Token selectToken(Text service, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java index a386123..949c6a2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java @@ -20,8 +20,8 @@ import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; @@ -36,7 +36,8 @@ /** * Log object for this class */ - static Log LOG = LogFactory.getLog(AdminACLsManager.class); + private static final Logger LOG = + LoggerFactory.getLogger(AdminACLsManager.class); /** * The current user at the time of object creation diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java index 8dea65f..dfe720f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java @@ -28,8 +28,8 @@ import java.util.Set; import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; @@ -68,7 +68,8 @@ @Evolving public class ContainerTokenIdentifier extends TokenIdentifier { - private static Log LOG = LogFactory.getLog(ContainerTokenIdentifier.class); + private static Logger LOG = + LoggerFactory.getLogger(ContainerTokenIdentifier.class); public static final Text KIND = new Text("ContainerToken"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java index a1c0a91..65c59ac 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java @@ -20,8 +20,8 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.io.Text; @@ -34,8 +34,8 @@ public class ContainerTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory - .getLog(ContainerTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(ContainerTokenSelector.class); @SuppressWarnings("unchecked") @Override diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java index cd1ad03..5ccc0cc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java @@ -25,8 +25,8 @@ import java.io.IOException; import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.io.IOUtils; @@ -46,7 +46,8 @@ @Evolving public class NMTokenIdentifier extends TokenIdentifier { - private static Log LOG = LogFactory.getLog(NMTokenIdentifier.class); + private static Logger LOG = + LoggerFactory.getLogger(NMTokenIdentifier.class); public static final Text KIND = new Text("NMToken"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java index 43899b5..ecc65c5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java @@ -20,8 +20,8 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; @@ -30,8 +30,8 @@ public class NMTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory - .getLog(NMTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(NMTokenSelector.class); @SuppressWarnings("unchecked") @Override diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java index 9ae4bd7..7f39fa4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.security; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -41,7 +41,8 @@ @Unstable public abstract class YarnAuthorizationProvider { - private static final Log LOG = LogFactory.getLog(YarnAuthorizationProvider.class); + private static final Logger LOG = + LoggerFactory.getLogger(YarnAuthorizationProvider.class); private static YarnAuthorizationProvider authorizer = null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java index e102fb2..5718965 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java @@ -20,8 +20,8 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; @@ -30,8 +30,8 @@ public class ClientToAMTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory - .getLog(ClientToAMTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(ClientToAMTokenSelector.class); @SuppressWarnings("unchecked") public Token selectToken(Text service, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java index 9ab2d76..cfeb62f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java @@ -20,8 +20,8 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.io.Text; @@ -34,8 +34,8 @@ public class RMDelegationTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory - .getLog(RMDelegationTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(RMDelegationTokenSelector.class); private boolean checkService(Text service, Token token) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java index 252dfa1..b75f288 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java @@ -20,8 +20,8 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.io.Text; @@ -34,8 +34,8 @@ public class TimelineDelegationTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory - .getLog(TimelineDelegationTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(TimelineDelegationTokenSelector.class); @SuppressWarnings("unchecked") public Token selectToken(Text service, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java index 97b4163..8cf34e9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java @@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.AccessControlException; @@ -40,8 +40,8 @@ @InterfaceAudience.Private public class ApplicationACLsManager { - private static final Log LOG = LogFactory - .getLog(ApplicationACLsManager.class); + private static final Logger LOG = LoggerFactory + .getLogger(ApplicationACLsManager.class); private static AccessControlList DEFAULT_YARN_APP_ACL = new AccessControlList(YarnConfiguration.DEFAULT_YARN_APP_ACL); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java index 638128e..688c7c8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.service.AbstractService; @@ -37,7 +37,8 @@ @Evolving public abstract class AbstractLivelinessMonitor extends AbstractService { - private static final Log LOG = LogFactory.getLog(AbstractLivelinessMonitor.class); + private static final Logger LOG = + LoggerFactory.getLogger(AbstractLivelinessMonitor.class); //thread which runs periodically to see the last time since a heartbeat is //received. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java index f33ddcd..8f54c48 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java @@ -18,25 +18,34 @@ package org.apache.hadoop.yarn.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.impl.Log4JLogger; +import org.apache.log4j.AppenderSkeleton; +import org.apache.log4j.FileAppender; +import org.apache.log4j.Layout; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.LogManager; +import org.apache.log4j.PatternLayout; +import org.apache.log4j.Priority; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; -import org.apache.log4j.*; import com.google.common.annotations.VisibleForTesting; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Enumeration; +import java.util.Map; +import java.util.HashMap; +import java.util.Timer; +import java.util.TimerTask; @InterfaceAudience.Private @InterfaceStability.Unstable public class AdHocLogDumper { - private static final Log LOG = LogFactory.getLog(AdHocLogDumper.class); + private static final Logger LOG = + LogManager.getLogger(AdHocLogDumper.class); private String name; private String targetFilename; @@ -60,53 +69,48 @@ public void dumpLogs(String level, int timePeriod) throw new YarnRuntimeException("Appender is already dumping logs"); } Level targetLevel = Level.toLevel(level); - Log log = LogFactory.getLog(name); + Logger logger = LogManager.getLogger(name); appenderLevels.clear(); - if (log instanceof Log4JLogger) { - Logger packageLogger = ((Log4JLogger) log).getLogger(); - currentLogLevel = packageLogger.getLevel(); - Level currentEffectiveLevel = packageLogger.getEffectiveLevel(); + currentLogLevel = logger.getLevel(); + Level currentEffectiveLevel = logger.getEffectiveLevel(); - // make sure we can create the appender first - Layout layout = new PatternLayout("%d{ISO8601} %p %c: %m%n"); - FileAppender fApp; - File file = - new File(System.getProperty("yarn.log.dir"), targetFilename); - try { - fApp = new FileAppender(layout, file.getAbsolutePath(), false); - } catch (IOException ie) { - LOG - .warn( - "Error creating file, can't dump logs to " - + file.getAbsolutePath(), ie); - throw ie; - } - fApp.setName(AdHocLogDumper.AD_HOC_DUMPER_APPENDER); - fApp.setThreshold(targetLevel); + // make sure we can create the appender first + Layout layout = new PatternLayout("%d{ISO8601} %p %c: %m%n"); + FileAppender fApp; + File file = + new File(System.getProperty("yarn.log.dir"), targetFilename); + try { + fApp = new FileAppender(layout, file.getAbsolutePath(), false); + } catch (IOException ie) { + LOG.warn("Error creating file, can't dump logs to " + + file.getAbsolutePath(), ie); + throw ie; + } + fApp.setName(AdHocLogDumper.AD_HOC_DUMPER_APPENDER); + fApp.setThreshold(targetLevel); - // get current threshold of all appenders and set it to the effective - // level - for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders - .hasMoreElements();) { - Object obj = appenders.nextElement(); - if (obj instanceof AppenderSkeleton) { - AppenderSkeleton appender = (AppenderSkeleton) obj; - appenderLevels.put(appender.getName(), appender.getThreshold()); - appender.setThreshold(currentEffectiveLevel); - } + // get current threshold of all appenders and set it to the effective + // level + for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); + appenders.hasMoreElements();) { + Object obj = appenders.nextElement(); + if (obj instanceof AppenderSkeleton) { + AppenderSkeleton appender = (AppenderSkeleton) obj; + appenderLevels.put(appender.getName(), appender.getThreshold()); + appender.setThreshold(currentEffectiveLevel); } + } - packageLogger.addAppender(fApp); - LOG.info("Dumping adhoc logs for " + name + " to " - + file.getAbsolutePath() + " for " + timePeriod + " milliseconds"); - packageLogger.setLevel(targetLevel); - logFlag = true; + logger.addAppender(fApp); + LOG.info("Dumping adhoc logs for " + name + " to " + + file.getAbsolutePath() + " for " + timePeriod + " milliseconds"); + logger.setLevel(targetLevel); + logFlag = true; - TimerTask restoreLogLevel = new RestoreLogLevel(); - Timer restoreLogLevelTimer = new Timer(); - restoreLogLevelTimer.schedule(restoreLogLevel, timePeriod); + TimerTask restoreLogLevel = new RestoreLogLevel(); + Timer restoreLogLevelTimer = new Timer(); + restoreLogLevelTimer.schedule(restoreLogLevel, timePeriod); } - } } @VisibleForTesting @@ -117,22 +121,19 @@ public static boolean getState() { class RestoreLogLevel extends TimerTask { @Override public void run() { - Log log = LogFactory.getLog(name); - if (log instanceof Log4JLogger) { - Logger logger = ((Log4JLogger) log).getLogger(); - logger.removeAppender(AD_HOC_DUMPER_APPENDER); - logger.setLevel(currentLogLevel); - for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders - .hasMoreElements();) { - Object obj = appenders.nextElement(); - if (obj instanceof AppenderSkeleton) { - AppenderSkeleton appender = (AppenderSkeleton) obj; - appender.setThreshold(appenderLevels.get(appender.getName())); - } + Logger logger = LogManager.getLogger(name); + logger.removeAppender(AD_HOC_DUMPER_APPENDER); + logger.setLevel(currentLogLevel); + for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); + appenders.hasMoreElements();) { + Object obj = appenders.nextElement(); + if (obj instanceof AppenderSkeleton) { + AppenderSkeleton appender = (AppenderSkeleton) obj; + appender.setThreshold(appenderLevels.get(appender.getName())); } - logFlag = false; - LOG.info("Done dumping adhoc logs for " + name); } - } + logFlag = false; + LOG.info("Done dumping adhoc logs for " + name); + } } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java index d203f65..08a5724 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java @@ -32,8 +32,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; @@ -66,7 +66,8 @@ @LimitedPrivate({"YARN", "MapReduce"}) public class FSDownload implements Callable { - private static final Log LOG = LogFactory.getLog(FSDownload.class); + private static final Logger LOG = + LoggerFactory.getLogger(FSDownload.class); private FileContext files; private final UserGroupInformation userUgi; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java index e8b6533..8aa5993 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java @@ -44,8 +44,8 @@ import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -61,8 +61,8 @@ @InterfaceStability.Unstable public class ProcfsBasedProcessTree extends ResourceCalculatorProcessTree { - static final Log LOG = LogFactory - .getLog(ProcfsBasedProcessTree.class); + private static final Logger LOG = LoggerFactory + .getLogger(ProcfsBasedProcessTree.class); private static final String PROCFS = "/proc/"; @@ -264,7 +264,7 @@ public void updateProcessTree() { } } - LOG.debug(this); + LOG.debug(this.toString()); if (smapsEnabled) { // Update smaps info @@ -410,7 +410,7 @@ private long getSmapBasedRssMemorySize(int olderThanAge) { } } } - LOG.debug(procMemInfo); + LOG.debug(procMemInfo.toString()); } } } @@ -807,11 +807,11 @@ private static void constructProcessSMAPInfo(ProcessTreeSmapMemInfo pInfo, } } } catch (FileNotFoundException f) { - LOG.error(f); + LOG.error(f.toString()); } catch (IOException e) { - LOG.error(e); + LOG.error(e.toString()); } catch (Throwable t) { - LOG.error(t); + LOG.error(t.toString()); } finally { IOUtils.closeQuietly(in); } 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 fd63d98..5fcc474 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,8 +17,8 @@ */ package org.apache.hadoop.yarn.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -33,8 +33,8 @@ @InterfaceAudience.LimitedPrivate({"YARN", "MAPREDUCE"}) @InterfaceStability.Unstable public class ResourceCalculatorPlugin extends Configured { - private static final Log LOG = - LogFactory.getLog(ResourceCalculatorPlugin.class); + private static final Logger LOG = + LoggerFactory.getLogger(ResourceCalculatorPlugin.class); private final SysInfo sys; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java index c581b83..9bbec5f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java @@ -20,8 +20,8 @@ import java.lang.reflect.Constructor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Evolving; @@ -38,8 +38,8 @@ @Public @Evolving public abstract class ResourceCalculatorProcessTree extends Configured { - static final Log LOG = LogFactory - .getLog(ResourceCalculatorProcessTree.class); + static final Logger LOG = LoggerFactory + .getLogger(ResourceCalculatorProcessTree.class); public static final int UNAVAILABLE = -1; /** diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java index 3c41558..b6604ee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java @@ -22,13 +22,14 @@ import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; @Private public class Times { - private static final Log LOG = LogFactory.getLog(Times.class); + private static final Logger LOG = + LoggerFactory.getLogger(Times.class); static final String ISO8601DATEFORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java index b4e5456..d7a92f0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.util.CpuTimeTracker; import org.apache.hadoop.util.Shell; @@ -34,8 +34,8 @@ @Private public class WindowsBasedProcessTree extends ResourceCalculatorProcessTree { - static final Log LOG = LogFactory - .getLog(WindowsBasedProcessTree.class); + private static final Logger LOG = LoggerFactory + .getLogger(WindowsBasedProcessTree.class); static class ProcessInfo { String pid; // process pid diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java index e515321..c6399d9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.util.VersionInfo; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -30,7 +30,8 @@ @InterfaceAudience.Private @InterfaceStability.Unstable public class YarnVersionInfo extends VersionInfo { - private static final Log LOG = LogFactory.getLog(YarnVersionInfo.class); + private static final Logger LOG = + LoggerFactory.getLogger(YarnVersionInfo.class); private static YarnVersionInfo YARN_VERSION_INFO = new YarnVersionInfo(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java index 9a3f703..61b1a87 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.yarn.util.resource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.records.Resource; @@ -26,8 +26,8 @@ @Private @Unstable public class DefaultResourceCalculator extends ResourceCalculator { - private static final Log LOG = - LogFactory.getLog(DefaultResourceCalculator.class); + private static final Logger LOG = + LoggerFactory.getLogger(DefaultResourceCalculator.class); @Override public int compare(Resource unused, Resource lhs, Resource rhs, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java index 17244e9..16176ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.yarn.util.resource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.records.Resource; @@ -53,7 +53,8 @@ @Private @Unstable public class DominantResourceCalculator extends ResourceCalculator { - static final Log LOG = LogFactory.getLog(DominantResourceCalculator.class); + private static final Logger LOG = + LoggerFactory.getLogger(DominantResourceCalculator.class); public DominantResourceCalculator() { } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java index 40d8d38..9b96fd7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.util.resource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; @@ -37,8 +37,8 @@ private enum RoundingDirection { UP, DOWN } - private static final Log LOG = - LogFactory.getLog(Resources.class); + private static final Logger LOG = + LoggerFactory.getLogger(Resources.class); /** * Helper class to create a resource with a fixed value for all resource diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java index 8946e2d..0ada51a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java @@ -28,8 +28,8 @@ import javax.ws.rs.ext.Provider; import javax.xml.bind.UnmarshalException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.security.authorize.AuthorizationException; @@ -44,8 +44,8 @@ @Singleton @Provider public class GenericExceptionHandler implements ExceptionMapper { - public static final Log LOG = LogFactory - .getLog(GenericExceptionHandler.class); + public static final Logger LOG = LoggerFactory + .getLogger(GenericExceptionHandler.class); private @Context HttpServletResponse response; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java index 34e2198..279a37b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.NetUtils; @@ -79,7 +79,8 @@ */ public class TestContainerLaunchRPC { - static final Log LOG = LogFactory.getLog(TestContainerLaunchRPC.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestContainerLaunchRPC.class); private static final RecordFactory recordFactory = RecordFactoryProvider .getRecordFactory(null); @@ -171,7 +172,7 @@ public StartContainersResponse startContainers( // make the thread sleep to look like its not going to respond Thread.sleep(10000); } catch (Exception e) { - LOG.error(e); + LOG.error(e.toString()); throw new YarnException(e); } throw new YarnException("Shouldn't happen!!"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java index 1690b81..c3dac91 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.NetUtils; @@ -74,7 +74,7 @@ */ public class TestContainerResourceIncreaseRPC { - static final Log LOG = LogFactory.getLog( + private static final Logger LOG = LoggerFactory.getLogger( TestContainerResourceIncreaseRPC.class); @Test @@ -188,7 +188,7 @@ public ContainerUpdateResponse updateContainer(ContainerUpdateRequest // make the thread sleep to look like its not going to respond Thread.sleep(10000); } catch (Exception e) { - LOG.error(e); + LOG.error(e.toString()); throw new YarnException(e); } throw new YarnException("Shouldn't happen!!"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java index bbb7840..25eb9e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java @@ -21,8 +21,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.lang3.Range; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.yarn.api.resource.PlacementConstraint; import org.apache.hadoop.yarn.api.resource.PlacementConstraints; import org.junit.Assert; @@ -40,7 +40,8 @@ * Generic helper class to validate protocol records. */ public class BasePBImplRecordsTest { - static final Log LOG = LogFactory.getLog(BasePBImplRecordsTest.class); + private static final Logger LOG = + LoggerFactory.getLogger(BasePBImplRecordsTest.class); @SuppressWarnings("checkstyle:visibilitymodifier") protected static HashMap typeValueCache = diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java index 9d16edb..0de8200 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java @@ -27,8 +27,8 @@ import java.util.TreeMap; import java.util.WeakHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse.TimelinePutError; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.junit.Assert; @@ -36,8 +36,8 @@ public class TestTimelineRecords { - private static final Log LOG = - LogFactory.getLog(TestTimelineRecords.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestTimelineRecords.class); @Test public void testEntities() throws Exception { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java index 221969b..b488a65 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.api.records.timelineservice; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ContainerId; @@ -36,8 +36,8 @@ public class TestTimelineServiceRecords { - private static final Log LOG = - LogFactory.getLog(TestTimelineServiceRecords.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestTimelineServiceRecords.class); @Test public void testTimelineEntities() throws Exception { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java index 76e5714..80c4c50 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java @@ -30,8 +30,8 @@ import java.io.IOException; import java.net.URI; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.Path; @@ -52,8 +52,8 @@ public class TestTimelineClientForATS1_5 { - protected static Log LOG = LogFactory - .getLog(TestTimelineClientForATS1_5.class); + protected static Logger LOG = LoggerFactory + .getLogger(TestTimelineClientForATS1_5.class); private TimelineClientImpl client; private static FileContext localFS; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java index 95595a9..6770c07 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java @@ -30,8 +30,8 @@ import javax.ws.rs.core.MultivaluedMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.ApplicationId; @@ -50,8 +50,8 @@ import org.junit.rules.TestName; public class TestTimelineClientV2Impl { - private static final Log LOG = - LogFactory.getLog(TestTimelineClientV2Impl.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestTimelineClientV2Impl.class); private TestV2TimelineClient client; private static final long TIME_TO_SLEEP = 150L; private static final String EXCEPTION_MSG = "Exception in the content"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java index 6aa56d8..cd6274a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java @@ -18,15 +18,16 @@ package org.apache.hadoop.yarn.event; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.yarn.event.AsyncDispatcher; import org.apache.hadoop.yarn.event.Event; import org.apache.hadoop.yarn.event.EventHandler; @SuppressWarnings({"unchecked", "rawtypes"}) public class InlineDispatcher extends AsyncDispatcher { - private static final Log LOG = LogFactory.getLog(InlineDispatcher.class); + private static final Logger LOG = + LoggerFactory.getLogger(InlineDispatcher.class); private class TestEventHandler implements EventHandler { @Override diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java index f85445e..6c26c40 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java @@ -38,8 +38,8 @@ import java.util.concurrent.CountDownLatch; import org.junit.Assert; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileStatus; @@ -70,8 +70,8 @@ private static final Configuration conf = new Configuration(); private static final FileSystem fs; private static final char filler = 'x'; - private static final Log LOG = LogFactory - .getLog(TestAggregatedLogFormat.class); + private static final Logger LOG = LoggerFactory + .getLogger(TestAggregatedLogFormat.class); static { try { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java index 046c94e..4b2545e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java @@ -18,14 +18,14 @@ package org.apache.hadoop.yarn.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.impl.Log4JLogger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.util.Time; import org.apache.log4j.Appender; import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.Logger; import org.apache.log4j.Priority; +import org.apache.log4j.LogManager; import org.junit.Assert; import org.junit.Test; @@ -34,20 +34,22 @@ import java.util.HashMap; import java.util.Map; +import static org.apache.hadoop.util.GenericsUtil.isLog4jLogger; + public class TestAdHocLogDumper { - private static final Log LOG = LogFactory.getLog(TestAdHocLogDumper.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestAdHocLogDumper.class); @Test public void testDumpingSchedulerLogs() throws Exception { Map levels = new HashMap<>(); - String logHierarchy = TestAdHocLogDumper.class.getName(); String logFilename = "test.log"; - Log log = LogFactory.getLog(logHierarchy); - if (log instanceof Log4JLogger) { - for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders - .hasMoreElements();) { + Logger logger = LoggerFactory.getLogger(TestAdHocLogDumper.class); + if (isLog4jLogger(this.getClass())) { + for (Enumeration appenders = LogManager.getRootLogger(). + getAllAppenders(); appenders.hasMoreElements();) { Object obj = appenders.nextElement(); if (obj instanceof AppenderSkeleton) { AppenderSkeleton appender = (AppenderSkeleton) obj; @@ -56,7 +58,8 @@ public void testDumpingSchedulerLogs() throws Exception { } } - AdHocLogDumper dumper = new AdHocLogDumper(logHierarchy, logFilename); + AdHocLogDumper dumper = new AdHocLogDumper(this.getClass().getName(), + logFilename); dumper.dumpLogs("DEBUG", 1000); LOG.debug("test message 1"); LOG.info("test message 2"); @@ -68,9 +71,9 @@ public void testDumpingSchedulerLogs() throws Exception { Assert.assertTrue(logFile.length() != 0); // make sure levels are set back to their original values - if (log instanceof Log4JLogger) { - for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders - .hasMoreElements();) { + if (isLog4jLogger(this.getClass())) { + for (Enumeration appenders = LogManager.getRootLogger(). + getAllAppenders(); appenders.hasMoreElements();) { Object obj = appenders.nextElement(); if (obj instanceof AppenderSkeleton) { AppenderSkeleton appender = (AppenderSkeleton) obj; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java index 08d6189..678687f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java @@ -58,8 +58,8 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FSDataOutputStream; @@ -87,7 +87,8 @@ */ public class TestFSDownload { - private static final Log LOG = LogFactory.getLog(TestFSDownload.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestFSDownload.class); private static AtomicLong uniqueNumberGenerator = new AtomicLong(System.currentTimeMillis()); private enum TEST_FILE_TYPE { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java index e788e80..9102a87 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java @@ -18,14 +18,17 @@ package org.apache.hadoop.yarn.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.util.Time; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; +import org.apache.log4j.LogManager; import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.hadoop.util.Time; import org.junit.Assert; import org.junit.Test; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,7 +36,9 @@ public class TestLog4jWarningErrorMetricsAppender { Log4jWarningErrorMetricsAppender appender; - Log logger = LogFactory.getLog(TestLog4jWarningErrorMetricsAppender.class); + Logger logger = LoggerFactory. + getLogger(TestLog4jWarningErrorMetricsAppender.class); + Marker fatal = MarkerFactory.getMarker("FATAL"); List cutoff = new ArrayList<>(); void setupAppender(int cleanupIntervalSeconds, long messageAgeLimitSeconds, @@ -42,18 +47,18 @@ void setupAppender(int cleanupIntervalSeconds, long messageAgeLimitSeconds, appender = new Log4jWarningErrorMetricsAppender(cleanupIntervalSeconds, messageAgeLimitSeconds, maxUniqueMessages); - Logger.getRootLogger().addAppender(appender); + LogManager.getRootLogger().addAppender(appender); } void removeAppender() { - Logger.getRootLogger().removeAppender(appender); + LogManager.getRootLogger().removeAppender(appender); } void logMessages(Level level, String message, int count) { for (int i = 0; i < count; ++i) { switch (level.toInt()) { case Level.FATAL_INT: - logger.fatal(message); + logger.error(fatal, message); break; case Level.ERROR_INT: logger.error(message); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java index 7349d22..e6b0928 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java @@ -38,8 +38,8 @@ import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileUtil; @@ -61,8 +61,8 @@ */ public class TestProcfsBasedProcessTree { - private static final Log LOG = LogFactory - .getLog(TestProcfsBasedProcessTree.class); + private static final Logger LOG = LoggerFactory + .getLogger(TestProcfsBasedProcessTree.class); protected static File TEST_ROOT_DIR = new File("target", TestProcfsBasedProcessTree.class.getName() + "-localDir"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java index 70ca23c..d959be2c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.net.DNSToSwitchMapping; @@ -35,7 +35,8 @@ public class TestRackResolver { - private static Log LOG = LogFactory.getLog(TestRackResolver.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestRackResolver.class); private static final String invalidHost = "invalidHost"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java index d3cba64..db5d4be 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java @@ -18,8 +18,8 @@ package org.apache.hadoop.yarn.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.junit.Assert; import org.junit.Test; @@ -27,8 +27,8 @@ import static org.junit.Assert.assertTrue; public class TestWindowsBasedProcessTree { - private static final Log LOG = LogFactory - .getLog(TestWindowsBasedProcessTree.class); + private static final Logger LOG = LoggerFactory + .getLogger(TestWindowsBasedProcessTree.class); class WindowsBasedProcessTreeTester extends WindowsBasedProcessTree { String infoStr = null; -- 2.7.4 (Apple Git-66)