Repository: hadoop Updated Branches: refs/heads/trunk 36e158ae9 -> de09716fb
MAPREDUCE-6977 Move logging APIs over to slf4j in hadoop-mapreduce-client-common. Contributed by Jinjiang Ling. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de09716f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de09716f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de09716f Branch: refs/heads/trunk Commit: de09716fb8782596ccf44a3cfc90ac3c4f288667 Parents: 36e158a Author: Steve Loughran <[email protected]> Authored: Fri Oct 27 10:43:40 2017 +0100 Committer: Steve Loughran <[email protected]> Committed: Fri Oct 27 10:45:03 2017 +0100 ---------------------------------------------------------------------- .../hadoop/mapred/LocalDistributedCacheManager.java | 10 +++++----- .../org/apache/hadoop/mapred/LocalJobRunner.java | 16 ++++++++-------- .../mapreduce/v2/jobhistory/FileNameIndexUtils.java | 9 +++++---- .../mapreduce/v2/jobhistory/JobHistoryUtils.java | 7 ++++--- .../v2/security/MRDelegationTokenRenewer.java | 8 ++++---- .../v2/security/client/ClientHSTokenSelector.java | 8 ++++---- .../org/apache/hadoop/mapreduce/v2/util/MRApps.java | 6 +++--- .../hadoop/mapred/TestLocalModeWithNewApis.java | 8 ++++---- .../hadoop/mapred/TestMRWithDistributedCache.java | 8 ++++---- 9 files changed, 41 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManager.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManager.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManager.java index c58a774..2a14ec3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManager.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManager.java @@ -39,8 +39,6 @@ import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.LocalDirAllocator; @@ -59,14 +57,16 @@ import org.apache.hadoop.yarn.util.FSDownload; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A helper class for managing the distributed cache for {@link LocalJobRunner}. */ @SuppressWarnings("deprecation") class LocalDistributedCacheManager { - public static final Log LOG = - LogFactory.getLog(LocalDistributedCacheManager.class); + public static final Logger LOG = + LoggerFactory.getLogger(LocalDistributedCacheManager.class); private List<String> localArchives = new ArrayList<String>(); private List<String> localFiles = new ArrayList<String>(); @@ -230,7 +230,7 @@ class LocalDistributedCacheManager { final URL[] urls = new URL[localClasspaths.size()]; for (int i = 0; i < localClasspaths.size(); ++i) { urls[i] = new File(localClasspaths.get(i)).toURI().toURL(); - LOG.info(urls[i]); + LOG.info(urls[i].toString()); } return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java index 02b9a87..c9dff6a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java @@ -38,8 +38,6 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.crypto.KeyGenerator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -74,13 +72,15 @@ import org.apache.hadoop.util.ReflectionUtils; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.hadoop.util.concurrent.HadoopExecutors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Implements MapReduce locally, in-process, for debugging. */ @InterfaceAudience.Private @InterfaceStability.Unstable public class LocalJobRunner implements ClientProtocol { - public static final Log LOG = - LogFactory.getLog(LocalJobRunner.class); + public static final Logger LOG = + LoggerFactory.getLogger(LocalJobRunner.class); /** The maximum number of map tasks to run in parallel in LocalJobRunner */ public static final String LOCAL_MAX_MAPS = @@ -587,7 +587,7 @@ public class LocalJobRunner implements ClientProtocol { } else { this.status.setRunState(JobStatus.FAILED); } - LOG.warn(id, t); + LOG.warn(id.toString(), t); JobEndNotifier.localRunnerNotification(job, status); @@ -721,17 +721,17 @@ public class LocalJobRunner implements ClientProtocol { @Override public synchronized void fsError(TaskAttemptID taskId, String message) throws IOException { - LOG.fatal("FSError: "+ message + "from task: " + taskId); + LOG.error("FSError: "+ message + "from task: " + taskId); } @Override public void shuffleError(TaskAttemptID taskId, String message) throws IOException { - LOG.fatal("shuffleError: "+ message + "from task: " + taskId); + LOG.error("shuffleError: "+ message + "from task: " + taskId); } public synchronized void fatalError(TaskAttemptID taskId, String msg) throws IOException { - LOG.fatal("Fatal: "+ msg + "from task: " + taskId); + LOG.error("Fatal: "+ msg + "from task: " + taskId); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java index aac3cb2..c5f4dbb 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java @@ -24,20 +24,21 @@ import java.net.URLDecoder; import java.net.URLEncoder; import static java.nio.charset.StandardCharsets.UTF_8; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.apache.hadoop.mapreduce.JobID; import org.apache.hadoop.mapreduce.TypeConverter; import org.apache.hadoop.mapreduce.v2.api.records.JobId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class FileNameIndexUtils { // Sanitize job history file for predictable parsing static final String DELIMITER = "-"; static final String DELIMITER_ESCAPE = "%2D"; - private static final Log LOG = LogFactory.getLog(FileNameIndexUtils.class); + private static final Logger LOG = + LoggerFactory.getLogger(FileNameIndexUtils.class); // Job history file names need to be backwards compatible // Only append new elements to the end of this list http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java index e279c03..58ac1db 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java @@ -28,8 +28,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -48,6 +46,8 @@ import org.apache.hadoop.mapreduce.v2.api.records.JobId; import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @InterfaceAudience.Private @InterfaceStability.Unstable @@ -121,7 +121,8 @@ public class JobHistoryUtils { public static final String TIMESTAMP_DIR_REGEX = "\\d{4}" + "\\" + Path.SEPARATOR + "\\d{2}" + "\\" + Path.SEPARATOR + "\\d{2}"; public static final Pattern TIMESTAMP_DIR_PATTERN = Pattern.compile(TIMESTAMP_DIR_REGEX); private static final String TIMESTAMP_DIR_FORMAT = "%04d" + File.separator + "%02d" + File.separator + "%02d"; - private static final Log LOG = LogFactory.getLog(JobHistoryUtils.class); + private static final Logger LOG = + LoggerFactory.getLogger(JobHistoryUtils.class); private static final PathFilter CONF_FILTER = new PathFilter() { @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/MRDelegationTokenRenewer.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/MRDelegationTokenRenewer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/MRDelegationTokenRenewer.java index 46faaa7..d24888e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/MRDelegationTokenRenewer.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/MRDelegationTokenRenewer.java @@ -21,8 +21,6 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.security.PrivilegedAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; @@ -38,12 +36,14 @@ import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenRenewer; import org.apache.hadoop.yarn.ipc.YarnRPC; import org.apache.hadoop.yarn.util.Records; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @InterfaceAudience.Private public class MRDelegationTokenRenewer extends TokenRenewer { - private static final Log LOG = LogFactory - .getLog(MRDelegationTokenRenewer.class); + private static final Logger LOG = LoggerFactory + .getLogger(MRDelegationTokenRenewer.class); @Override public boolean handleKind(Text kind) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSTokenSelector.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSTokenSelector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSTokenSelector.java index 7aadaee..99674b1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSTokenSelector.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSTokenSelector.java @@ -20,19 +20,19 @@ package org.apache.hadoop.mapreduce.v2.security.client; import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.v2.api.MRDelegationTokenIdentifier; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenSelector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ClientHSTokenSelector implements TokenSelector<MRDelegationTokenIdentifier> { - private static final Log LOG = LogFactory - .getLog(ClientHSTokenSelector.class); + private static final Logger LOG = LoggerFactory + .getLogger(ClientHSTokenSelector.class); @SuppressWarnings("unchecked") public Token<MRDelegationTokenIdentifier> selectToken(Text service, http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java index 5777117..d435a1f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java @@ -34,8 +34,6 @@ import java.util.Map; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Unstable; @@ -70,6 +68,8 @@ import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.hadoop.yarn.util.Apps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Helper class for MR applications @@ -77,7 +77,7 @@ import org.apache.hadoop.yarn.util.Apps; @Private @Unstable public class MRApps extends Apps { - public static final Log LOG = LogFactory.getLog(MRApps.class); + public static final Logger LOG = LoggerFactory.getLogger(MRApps.class); public static String toString(JobId jid) { return jid.toString(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java index e9e0470..d047b6b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java @@ -27,8 +27,6 @@ import java.io.InputStreamReader; import java.util.Random; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; @@ -44,11 +42,13 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestLocalModeWithNewApis { - public static final Log LOG = - LogFactory.getLog(TestLocalModeWithNewApis.class); + public static final Logger LOG = + LoggerFactory.getLogger(TestLocalModeWithNewApis.class); Configuration conf; http://git-wip-us.apache.org/repos/asf/hadoop/blob/de09716f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java index d1d392e..2f0a6bd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java @@ -31,8 +31,6 @@ import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.filecache.DistributedCache; import org.apache.hadoop.fs.FSDataOutputStream; @@ -50,6 +48,8 @@ import org.apache.hadoop.mapreduce.TaskInputOutputContext; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Tests the use of the * {@link org.apache.hadoop.mapreduce.filecache.DistributedCache} within the @@ -81,8 +81,8 @@ public class TestMRWithDistributedCache { } } - private static final Log LOG = - LogFactory.getLog(TestMRWithDistributedCache.class); + private static final Logger LOG = + LoggerFactory.getLogger(TestMRWithDistributedCache.class); private static class DistributedCacheChecker { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
