You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/03/23 19:59:47 UTC
[4/4] tez git commit: TEZ-2176. Move all logging to slf4j.
Contributed by Vasanth kumar RJ.
TEZ-2176. Move all logging to slf4j. Contributed by Vasanth kumar RJ.
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6d0b10a8
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6d0b10a8
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6d0b10a8
Branch: refs/heads/master
Commit: 6d0b10a8445d3c26b0958ce816c64b577a1608d9
Parents: aa784be
Author: Siddharth Seth <ss...@apache.org>
Authored: Mon Mar 23 11:59:18 2015 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Mon Mar 23 11:59:18 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
pom.xml | 16 +++++------
tez-api/pom.xml | 8 ++----
.../java/org/apache/tez/client/TezClient.java | 6 ++--
.../org/apache/tez/client/TezClientUtils.java | 6 ++--
.../org/apache/tez/common/TezCommonUtils.java | 8 +++---
.../java/org/apache/tez/common/TezUtils.java | 6 ++--
.../java/org/apache/tez/common/VersionInfo.java | 6 ++--
.../tez/common/counters/AbstractCounters.java | 6 ++--
.../org/apache/tez/common/counters/Limits.java | 6 ++--
.../common/security/ACLConfigurationParser.java | 6 ++--
.../apache/tez/common/security/ACLManager.java | 6 ++--
.../apache/tez/common/security/TokenCache.java | 6 ++--
.../main/java/org/apache/tez/dag/api/DAG.java | 6 ++--
.../apache/tez/dag/api/TezConfiguration.java | 6 ++--
.../tez/dag/api/client/DAGClientImpl.java | 6 ++--
.../dag/api/client/DAGClientTimelineImpl.java | 6 ++--
.../dag/api/client/rpc/DAGClientRPCImpl.java | 6 ++--
.../apache/tez/common/TestTezCommonUtils.java | 6 ++--
tez-common/pom.xml | 8 ++----
.../org/apache/tez/common/AsyncDispatcher.java | 8 +++---
.../org/apache/tez/common/TezUtilsInternal.java | 10 +++----
.../org/apache/tez/dag/records/TestTezIds.java | 6 ++--
tez-dag/pom.xml | 8 ++----
.../java/org/apache/tez/client/LocalClient.java | 9 +++---
.../tez/dag/api/client/DAGClientHandler.java | 6 ++--
.../tez/dag/api/client/DAGClientServer.java | 6 ++--
.../apache/tez/dag/app/ContainerContext.java | 6 ++--
.../org/apache/tez/dag/app/DAGAppMaster.java | 14 ++++-----
.../org/apache/tez/dag/app/RecoveryParser.java | 6 ++--
.../dag/app/TaskAttemptListenerImpTezDag.java | 8 +++---
.../app/dag/RootInputInitializerManager.java | 6 ++--
.../apache/tez/dag/app/dag/impl/DAGImpl.java | 6 ++--
.../app/dag/impl/DAGSchedulerNaturalOrder.java | 8 +++---
.../DAGSchedulerNaturalOrderControlled.java | 8 +++---
.../org/apache/tez/dag/app/dag/impl/Edge.java | 6 ++--
.../dag/impl/ImmediateStartVertexManager.java | 6 ++--
.../tez/dag/app/dag/impl/TaskAttemptImpl.java | 6 ++--
.../app/dag/impl/TaskAttemptImplHelpers.java | 6 ++--
.../apache/tez/dag/app/dag/impl/TaskImpl.java | 6 ++--
.../apache/tez/dag/app/dag/impl/VertexImpl.java | 8 +++---
.../tez/dag/app/dag/impl/VertexManager.java | 6 ++--
.../speculation/legacy/LegacySpeculator.java | 6 ++--
.../dag/app/launcher/ContainerLauncherImpl.java | 6 ++--
.../app/launcher/LocalContainerLauncher.java | 6 ++--
.../dag/app/rm/LocalTaskSchedulerService.java | 6 ++--
.../dag/app/rm/TaskSchedulerEventHandler.java | 6 ++--
.../tez/dag/app/rm/TezAMRMClientAsync.java | 6 ++--
.../dag/app/rm/YarnTaskSchedulerService.java | 6 ++--
.../app/rm/container/AMContainerHelpers.java | 6 ++--
.../dag/app/rm/container/AMContainerImpl.java | 6 ++--
.../dag/app/rm/container/AMContainerMap.java | 6 ++--
.../apache/tez/dag/app/rm/node/AMNodeImpl.java | 6 ++--
.../tez/dag/app/rm/node/AMNodeTracker.java | 6 ++--
.../apache/tez/dag/app/web/AMWebController.java | 6 ++--
.../apache/tez/dag/app/web/WebUIService.java | 7 ++---
.../tez/dag/history/HistoryEventHandler.java | 6 ++--
.../dag/history/events/DAGFinishedEvent.java | 6 ++--
.../dag/history/events/DAGSubmittedEvent.java | 6 ++--
.../events/TaskAttemptFinishedEvent.java | 6 ++--
.../dag/history/events/TaskFinishedEvent.java | 6 ++--
.../dag/history/events/VertexFinishedEvent.java | 6 ++--
.../VertexRecoverableEventsGeneratedEvent.java | 6 ++--
.../impl/SimpleHistoryLoggingService.java | 6 ++--
.../dag/history/recovery/RecoveryService.java | 8 +++---
.../utils/Simple2LevelVersionComparator.java | 6 ++--
.../dag/utils/TaskSpecificLaunchCmdOption.java | 8 +++---
.../apache/tez/dag/app/MockDAGAppMaster.java | 8 +++---
.../tez/dag/app/dag/impl/TestDAGImpl.java | 8 +++---
.../tez/dag/app/dag/impl/TestTaskImpl.java | 6 ++--
.../tez/dag/app/dag/impl/TestVertexImpl.java | 6 ++--
.../dag/app/dag/impl/TestVertexRecovery.java | 6 ++--
.../tez/dag/app/rm/TestContainerReuse.java | 8 +++---
.../tez/dag/app/rm/node/TestAMNodeTracker.java | 6 ++--
.../TestHistoryEventsProtoConversion.java | 6 ++--
tez-examples/pom.xml | 4 +--
.../apache/tez/examples/HashJoinExample.java | 6 ++--
.../org/apache/tez/examples/JoinDataGen.java | 8 +++---
.../org/apache/tez/examples/JoinValidate.java | 8 +++---
.../apache/tez/examples/OrderedWordCount.java | 6 ++--
.../tez/examples/SimpleSessionExample.java | 6 ++--
.../tez/examples/SortMergeJoinExample.java | 6 ++--
.../org/apache/tez/examples/TezExampleBase.java | 10 +++----
.../java/org/apache/tez/examples/WordCount.java | 6 ++--
tez-mapreduce/pom.xml | 8 ++----
.../split/TezGroupedSplitsInputFormat.java | 6 ++--
.../mapred/split/TezMapredSplitsGrouper.java | 6 ++--
.../mapreduce/split/SplitMetaInfoReaderTez.java | 6 ++--
.../split/TezGroupedSplitsInputFormat.java | 6 ++--
.../split/TezMapReduceSplitsGrouper.java | 6 ++--
.../mapreduce/client/ResourceMgrDelegate.java | 6 ++--
.../apache/tez/mapreduce/client/YARNRunner.java | 6 ++--
.../tez/mapreduce/combine/MRCombiner.java | 6 ++--
.../mapreduce/committer/MROutputCommitter.java | 6 ++--
.../common/MRInputAMSplitGenerator.java | 6 ++--
.../common/MRInputSplitDistributor.java | 6 ++--
.../apache/tez/mapreduce/hadoop/MRHelpers.java | 6 ++--
.../tez/mapreduce/hadoop/MRInputHelpers.java | 6 ++--
.../tez/mapreduce/hadoop/mapred/MRCounters.java | 13 ---------
.../org/apache/tez/mapreduce/input/MRInput.java | 6 ++--
.../tez/mapreduce/input/MRInputLegacy.java | 6 ++--
.../tez/mapreduce/input/MultiMRInput.java | 6 ++--
.../apache/tez/mapreduce/lib/MRInputUtils.java | 6 ++--
.../tez/mapreduce/lib/MRReaderMapReduce.java | 6 ++--
.../tez/mapreduce/lib/MRReaderMapred.java | 6 ++--
.../apache/tez/mapreduce/output/MROutput.java | 7 ++---
.../tez/mapreduce/partition/MRPartitioner.java | 6 ++--
.../apache/tez/mapreduce/processor/MRTask.java | 6 ++--
.../mapreduce/processor/SimpleMRProcessor.java | 6 ++--
.../mapreduce/processor/map/MapProcessor.java | 6 ++--
.../processor/reduce/ReduceProcessor.java | 6 ++--
.../hadoop/mapred/split/TestGroupedSplits.java | 8 +++---
.../org/apache/tez/mapreduce/TestUmbilical.java | 6 ++--
.../tez/mapreduce/input/TestMultiMRInput.java | 6 ++--
.../tez/mapreduce/processor/MapUtils.java | 6 ++--
.../processor/map/TestMapProcessor.java | 6 ++--
.../processor/reduce/TestReduceProcessor.java | 6 ++--
.../tez-yarn-timeline-history-with-acls/pom.xml | 4 +--
.../ats/acls/ATSHistoryACLPolicyManager.java | 6 ++--
.../ats/acls/TestATSHistoryWithACLs.java | 6 ++--
tez-plugins/tez-yarn-timeline-history/pom.xml | 4 +--
.../logging/ats/ATSHistoryLoggingService.java | 6 ++--
.../ats/TestATSHistoryLoggingService.java | 6 ++--
.../ats/TestATSHistoryWithMiniCluster.java | 6 ++--
.../tez/tests/MiniTezClusterWithTimeline.java | 6 ++--
tez-runtime-internals/pom.xml | 4 +--
.../runtime/LogicalIOProcessorRuntimeTask.java | 8 +++---
.../common/resources/MemoryDistributor.java | 8 +++---
.../common/resources/ScalingAllocator.java | 8 +++---
.../tez/runtime/metrics/TaskCounterUpdater.java | 6 ++--
.../tez/runtime/task/ContainerReporter.java | 5 ++--
.../apache/tez/runtime/task/TaskReporter.java | 5 ++--
.../org/apache/tez/runtime/task/TezChild.java | 7 +++--
.../apache/tez/runtime/task/TezTaskRunner.java | 5 ++--
.../tez/runtime/task/TestTaskExecution.java | 9 +++---
tez-runtime-library/pom.xml | 4 +--
.../vertexmanager/InputReadyVertexManager.java | 8 +++---
.../vertexmanager/ShuffleVertexManager.java | 8 +++---
.../broadcast/output/FileBasedKVWriter.java | 6 ++--
.../runtime/library/common/TezRuntimeUtils.java | 8 +++---
.../runtime/library/common/ValuesIterator.java | 6 ++--
.../common/readers/UnorderedKVReader.java | 6 ++--
.../TezBytesWritableSerialization.java | 6 ++--
.../common/shuffle/DiskFetchedInput.java | 6 ++--
.../runtime/library/common/shuffle/Fetcher.java | 9 +++---
.../library/common/shuffle/HttpConnection.java | 6 ++--
.../common/shuffle/LocalDiskFetchedInput.java | 6 ++--
.../library/common/shuffle/ShuffleUtils.java | 30 ++++++++++++++------
.../impl/ShuffleInputEventHandlerImpl.java | 6 ++--
.../common/shuffle/impl/ShuffleManager.java | 10 +++----
.../impl/SimpleFetchedInputAllocator.java | 6 ++--
.../orderedgrouped/FetcherOrderedGrouped.java | 6 ++--
.../shuffle/orderedgrouped/InMemoryWriter.java | 6 ++--
.../shuffle/orderedgrouped/MapOutput.java | 6 ++--
.../shuffle/orderedgrouped/MergeManager.java | 6 ++--
.../shuffle/orderedgrouped/MergeThread.java | 6 ++--
.../common/shuffle/orderedgrouped/Shuffle.java | 6 ++--
.../ShuffleInputEventHandlerOrderedGrouped.java | 6 ++--
.../orderedgrouped/ShuffleScheduler.java | 10 +++----
.../common/sort/impl/ExternalSorter.java | 6 ++--
.../runtime/library/common/sort/impl/IFile.java | 16 ++++++++---
.../common/sort/impl/IFileInputStream.java | 6 ++--
.../common/sort/impl/PipelinedSorter.java | 6 ++--
.../library/common/sort/impl/TezMerger.java | 6 ++--
.../common/sort/impl/dflt/DefaultSorter.java | 6 ++--
.../task/local/output/TezTaskOutputFiles.java | 6 ++--
.../BaseUnorderedPartitionedKVWriter.java | 6 ++--
.../writers/UnorderedPartitionedKVWriter.java | 16 +++++------
.../library/input/OrderedGroupedKVInput.java | 6 ++--
.../input/OrderedGroupedMergedKVInput.java | 8 +++---
.../runtime/library/input/UnorderedKVInput.java | 6 ++--
.../output/OrderedPartitionedKVOutput.java | 8 +++---
.../library/output/UnorderedKVOutput.java | 6 ++--
.../output/UnorderedPartitionedKVOutput.java | 8 +++---
.../library/processor/SleepProcessor.java | 6 ++--
.../WeightedScalingMemoryDistributor.java | 8 +++---
.../library/common/TestValuesIterator.java | 6 ++--
.../common/comparator/TestProxyComparator.java | 6 ++--
.../impl/TestSimpleFetchedInputAllocator.java | 6 ++--
.../shuffle/orderedgrouped/TestFetcher.java | 6 ++--
.../orderedgrouped/TestMergeManager.java | 6 ++--
.../library/common/sort/impl/TestIFile.java | 6 ++--
.../library/common/sort/impl/TestTezMerger.java | 6 ++--
.../TestUnorderedPartitionedKVWriter.java | 6 ++--
.../output/TestOnFileUnorderedKVOutput.java | 6 ++--
tez-tests/pom.xml | 4 +--
.../mapreduce/examples/BroadcastLoadGen.java | 8 +++---
.../mapreduce/examples/FilterLinesByWord.java | 8 +++---
.../examples/FilterLinesByWordOneToOne.java | 8 +++---
.../examples/GroupByOrderByMRRTest.java | 6 ++--
.../tez/mapreduce/examples/MRRSleepJob.java | 6 ++--
.../tez/mapreduce/examples/MapredWordCount.java | 6 ++--
.../tez/mapreduce/examples/RPCLoadGen.java | 8 +++---
.../examples/TestOrderedWordCount.java | 8 +++---
.../processor/FilterByWordInputProcessor.java | 6 ++--
.../processor/FilterByWordOutputProcessor.java | 6 ++--
.../org/apache/tez/mapreduce/TestMRRJobs.java | 6 ++--
.../apache/tez/mapreduce/TestMRRJobsDAGApi.java | 6 ++--
.../org/apache/tez/test/MiniTezCluster.java | 6 ++--
.../org/apache/tez/test/TestAMRecovery.java | 6 ++--
.../org/apache/tez/test/TestDAGRecovery.java | 6 ++--
.../org/apache/tez/test/TestDAGRecovery2.java | 6 ++--
.../tez/test/TestExceptionPropagation.java | 8 +++---
.../org/apache/tez/test/TestFaultTolerance.java | 6 ++--
.../java/org/apache/tez/test/TestInput.java | 8 +++---
.../java/org/apache/tez/test/TestOutput.java | 6 ++--
.../java/org/apache/tez/test/TestProcessor.java | 8 +++---
.../java/org/apache/tez/test/TestTezJobs.java | 6 ++--
.../apache/tez/test/dag/MultiAttemptDAG.java | 8 +++---
.../java/org/apache/tez/tools/TFileLoader.java | 6 ++--
.../org/apache/tez/tools/TFileRecordReader.java | 6 ++--
211 files changed, 708 insertions(+), 709 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c9d114..f8677b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@ Apache Tez Change Log
Release 0.7.0: Unreleased
INCOMPATIBLE CHANGES
+ TEZ-2176. Move all logging to slf4j. (commons-logging jar no longer part of Tez tar)
ALL CHANGES:
TEZ-2209. Fix pipelined shuffle to fetch data from any one attempt
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9a9ad6..1e29c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,9 +169,14 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -179,11 +184,6 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/pom.xml
----------------------------------------------------------------------
diff --git a/tez-api/pom.xml b/tez-api/pom.xml
index 63415ba..e726135 100644
--- a/tez-api/pom.xml
+++ b/tez-api/pom.xml
@@ -26,8 +26,8 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -38,10 +38,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/client/TezClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
index d07793c..bf157d1 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClient.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
@@ -25,8 +25,8 @@ import java.util.Map;
import javax.annotation.Nullable;
-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.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
@@ -87,7 +87,7 @@ import com.google.protobuf.ServiceException;
@Public
public class TezClient {
- private static final Log LOG = LogFactory.getLog(TezClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezClient.class);
@VisibleForTesting
static final String NO_CLUSTER_DIAGNOSTICS_MSG = "No cluster diagnostics found.";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index 2a29ce6..d12ece2 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -39,8 +39,8 @@ import java.util.Map.Entry;
import com.google.common.base.Strings;
import org.apache.commons.lang.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.fs.FSDataOutputStream;
@@ -110,7 +110,7 @@ import com.google.common.collect.Lists;
@Private
public class TezClientUtils {
- private static Log LOG = LogFactory.getLog(TezClientUtils.class);
+ private static Logger LOG = LoggerFactory.getLogger(TezClientUtils.class);
private static final int UTF8_CHUNK_SIZE = 16 * 1024;
private static FileStatus[] getLRFileStatus(String fileName, Configuration conf) throws
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java b/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
index 05e868c..e4cf028 100644
--- a/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/common/TezCommonUtils.java
@@ -32,8 +32,8 @@ import java.util.zip.InflaterInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ArrayUtils;
-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.fs.FSDataOutputStream;
@@ -59,7 +59,7 @@ public class TezCommonUtils {
.createImmutable((short) 0700); // rwx--------
public static final FsPermission TEZ_AM_FILE_PERMISSION = FsPermission
.createImmutable((short) 0644); // rw-r--r--
- private static final Log LOG = LogFactory.getLog(TezClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezClient.class);
public static final String TEZ_SYSTEM_SUB_DIR = ".tez";
@@ -410,7 +410,7 @@ public class TezCommonUtils {
}
}
- public static void logCredentials(Log log, Credentials credentials, String identifier) {
+ public static void logCredentials(Logger log, Credentials credentials, String identifier) {
if (log.isDebugEnabled()) {
log.debug(getCredentialsInfo(credentials, identifier));
}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/TezUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/TezUtils.java b/tez-api/src/main/java/org/apache/tez/common/TezUtils.java
index 1cbfbe0..8c2f118 100644
--- a/tez-api/src/main/java/org/apache/tez/common/TezUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/common/TezUtils.java
@@ -31,8 +31,8 @@ import java.util.zip.InflaterInputStream;
import com.google.common.base.Preconditions;
import com.google.protobuf.ByteString;
-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.tez.client.TezClientUtils;
@@ -50,7 +50,7 @@ import org.codehaus.jettison.json.JSONObject;
@InterfaceAudience.Public
public class TezUtils {
- private static final Log LOG = LogFactory.getLog(TezUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezUtils.class);
/**
* Allows changing the log level for task / AM logging. </p>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/VersionInfo.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/VersionInfo.java b/tez-api/src/main/java/org/apache/tez/common/VersionInfo.java
index 7e2a7e5..9f98974 100644
--- a/tez-api/src/main/java/org/apache/tez/common/VersionInfo.java
+++ b/tez-api/src/main/java/org/apache/tez/common/VersionInfo.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-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.io.IOUtils;
@@ -34,7 +34,7 @@ import com.google.common.annotations.VisibleForTesting;
@Private
@Unstable
public class VersionInfo {
- private static final Log LOG = LogFactory.getLog(VersionInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(VersionInfo.class);
private final Properties info;
private final String component;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/counters/AbstractCounters.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/counters/AbstractCounters.java b/tez-api/src/main/java/org/apache/tez/common/counters/AbstractCounters.java
index 6b9399d..470cb78 100644
--- a/tez-api/src/main/java/org/apache/tez/common/counters/AbstractCounters.java
+++ b/tez-api/src/main/java/org/apache/tez/common/counters/AbstractCounters.java
@@ -29,8 +29,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap;
-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.Unstable;
@@ -55,7 +55,7 @@ public abstract class AbstractCounters<C extends TezCounter,
G extends CounterGroupBase<C>>
implements Writable, Iterable<G> {
- protected static final Log LOG = LogFactory.getLog("mapreduce.Counters");
+ protected static final Logger LOG = LoggerFactory.getLogger("mapreduce.Counters");
/**
* A cache from enum values to the associated counter.
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java b/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
index 38e825a..f5a51e4 100644
--- a/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
+++ b/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
@@ -18,8 +18,8 @@
package org.apache.tez.common.counters;
-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.tez.dag.api.TezConfiguration;
@@ -27,7 +27,7 @@ import org.apache.tez.dag.api.TezConfiguration;
@InterfaceAudience.Private
public class Limits {
- private static final Log LOG = LogFactory.getLog(Limits.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Limits.class);
private static Configuration conf = null;
private static int GROUP_NAME_MAX;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java b/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
index e6c4101..1c1d7f6 100644
--- a/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
+++ b/tez-api/src/main/java/org/apache/tez/common/security/ACLConfigurationParser.java
@@ -26,8 +26,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Pattern;
-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.tez.common.TezCommonUtils;
@@ -42,7 +42,7 @@ import com.google.common.collect.Sets;
@Private
public class ACLConfigurationParser {
- private static final Log LOG = LogFactory.getLog(ACLConfigurationParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ACLConfigurationParser.class);
private final Configuration conf;
private final Map<ACLType, Set<String>> allowedUsers;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/security/ACLManager.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/security/ACLManager.java b/tez-api/src/main/java/org/apache/tez/common/security/ACLManager.java
index f91812e..cebb17a 100644
--- a/tez-api/src/main/java/org/apache/tez/common/security/ACLManager.java
+++ b/tez-api/src/main/java/org/apache/tez/common/security/ACLManager.java
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-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;
@@ -43,7 +43,7 @@ import com.google.common.annotations.VisibleForTesting;
@Private
public class ACLManager {
- private static final Log LOG = LogFactory.getLog(ACLManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ACLManager.class);
public static final String WILDCARD_ACL_VALUE = "*";
private final String dagUser;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/common/security/TokenCache.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/security/TokenCache.java b/tez-api/src/main/java/org/apache/tez/common/security/TokenCache.java
index d270fd4..8bb23fb 100644
--- a/tez-api/src/main/java/org/apache/tez/common/security/TokenCache.java
+++ b/tez-api/src/main/java/org/apache/tez/common/security/TokenCache.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-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;
@@ -46,7 +46,7 @@ import org.apache.hadoop.security.token.TokenIdentifier;
@InterfaceStability.Unstable
public class TokenCache {
- private static final Log LOG = LogFactory.getLog(TokenCache.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TokenCache.class);
/**
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
index 89bd5b0..4dffd4d 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
@@ -32,8 +32,8 @@ import java.util.Stack;
import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections4.bidimap.DualLinkedHashBidiMap;
-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.InterfaceAudience.Public;
import org.apache.hadoop.conf.Configuration;
@@ -74,7 +74,7 @@ import com.google.common.collect.Sets;
@Public
public class DAG {
- private static final Log LOG = LogFactory.getLog(DAG.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAG.class);
final BidiMap<String, Vertex> vertices =
new DualLinkedHashBidiMap<String, Vertex>();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index c97999f..7a49ee5 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-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.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -45,7 +45,7 @@ public class TezConfiguration extends Configuration {
public final static String TEZ_SITE_XML = "tez-site.xml";
- private final static Log LOG = LogFactory.getLog(TezConfiguration.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TezConfiguration.class);
private static Map<String, Scope> PropertyScope = new HashMap<String, Scope>();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
index b5bb599..dd83ecc 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
@@ -29,8 +29,8 @@ import java.util.Set;
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.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -49,7 +49,7 @@ import org.apache.tez.dag.api.records.DAGProtos;
@Private
public class DAGClientImpl extends DAGClient {
- private static final Log LOG = LogFactory.getLog(DAGClientImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGClientImpl.class);
private final ApplicationId appId;
private final String dagId;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientTimelineImpl.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientTimelineImpl.java b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientTimelineImpl.java
index 702eead..fe4b033 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientTimelineImpl.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientTimelineImpl.java
@@ -45,8 +45,8 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.client.urlconnection.HttpURLConnectionFactory;
import com.sun.jersey.client.urlconnection.URLConnectionClientHandler;
import com.sun.jersey.json.impl.provider.entity.JSONRootElementProvider;
-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,7 @@ import org.codehaus.jettison.json.JSONObject;
@Private
public class DAGClientTimelineImpl extends DAGClient {
- private static final Log LOG = LogFactory.getLog(DAGClientTimelineImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGClientTimelineImpl.class);
private static final String FILTER_BY_FIELDS = "primaryfilters,otherinfo";
private static final String HTTPS_SCHEME = "https://";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/main/java/org/apache/tez/dag/api/client/rpc/DAGClientRPCImpl.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/client/rpc/DAGClientRPCImpl.java b/tez-api/src/main/java/org/apache/tez/dag/api/client/rpc/DAGClientRPCImpl.java
index 74e3b53..27c54fc 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/client/rpc/DAGClientRPCImpl.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/rpc/DAGClientRPCImpl.java
@@ -23,8 +23,8 @@ import java.util.Set;
import javax.annotation.Nullable;
-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.ipc.RPC;
import org.apache.hadoop.ipc.RemoteException;
@@ -51,7 +51,7 @@ import com.google.protobuf.ServiceException;
@Private
public class DAGClientRPCImpl extends DAGClient {
- private static final Log LOG = LogFactory.getLog(DAGClientRPCImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGClientRPCImpl.class);
private static final String DAG_NOT_RUNNING_CLASS_NAME =
DAGNotRunningException.class.getCanonicalName();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java b/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
index db11178..a7e6069 100644
--- a/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
+++ b/tez-api/src/test/java/org/apache/tez/common/TestTezCommonUtils.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.Map;
import com.google.common.collect.Maps;
-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.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -49,7 +49,7 @@ public class TestTezCommonUtils {
+ TestTezCommonUtils.class.getName() + "-tmpDir";
private static MiniDFSCluster dfsCluster = null;
private static FileSystem remoteFs = null;
- private static final Log LOG = LogFactory.getLog(TestTezCommonUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestTezCommonUtils.class);
@BeforeClass
public static void setup() throws Exception {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-common/pom.xml
----------------------------------------------------------------------
diff --git a/tez-common/pom.xml b/tez-common/pom.xml
index 54c150c..679d1c8 100644
--- a/tez-common/pom.xml
+++ b/tez-common/pom.xml
@@ -26,18 +26,14 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-common/src/main/java/org/apache/tez/common/AsyncDispatcher.java
----------------------------------------------------------------------
diff --git a/tez-common/src/main/java/org/apache/tez/common/AsyncDispatcher.java b/tez-common/src/main/java/org/apache/tez/common/AsyncDispatcher.java
index fad0453..173b4c7 100644
--- a/tez-common/src/main/java/org/apache/tez/common/AsyncDispatcher.java
+++ b/tez-common/src/main/java/org/apache/tez/common/AsyncDispatcher.java
@@ -24,8 +24,6 @@ import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.CompositeService;
@@ -34,6 +32,8 @@ import org.apache.hadoop.yarn.event.Dispatcher;
import org.apache.hadoop.yarn.event.Event;
import org.apache.hadoop.yarn.event.EventHandler;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
@@ -47,7 +47,7 @@ import com.google.common.collect.Maps;
@Private
public class AsyncDispatcher extends CompositeService implements Dispatcher {
- private static final Log LOG = LogFactory.getLog(AsyncDispatcher.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncDispatcher.class);
private final String name;
private final BlockingQueue<Event> eventQueue;
@@ -184,7 +184,7 @@ public class AsyncDispatcher extends CompositeService implements Dispatcher {
throw new Exception("No handler for registered for " + type);
}
} catch (Throwable t) {
- LOG.fatal("Error in dispatcher thread", t);
+ LOG.error("Error in dispatcher thread", t);
// If serviceStop is called, we should exit this thread gracefully.
if (exitOnDispatchException
&& (ShutdownHookManager.get().isShutdownInProgress()) == false
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
----------------------------------------------------------------------
diff --git a/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java b/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
index 74d54ff..9c78377 100644
--- a/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
+++ b/tez-common/src/main/java/org/apache/tez/common/TezUtilsInternal.java
@@ -35,25 +35,25 @@ import java.util.zip.Inflater;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.TextFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.Credentials;
import org.apache.log4j.Appender;
-import org.apache.log4j.Logger;
import org.apache.tez.dag.api.DagTypeConverters;
import org.apache.tez.dag.api.TezConstants;
import org.apache.tez.dag.api.records.DAGProtos;
import org.apache.tez.dag.api.records.DAGProtos.ConfigurationProto;
import org.apache.tez.dag.api.records.DAGProtos.PlanKeyValuePair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Stopwatch;
@Private
public class TezUtilsInternal {
- private static final Log LOG = LogFactory.getLog(TezUtilsInternal.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezUtilsInternal.class);
public static void addUserSpecifiedTezConfiguration(String baseDir, Configuration conf) throws
IOException {
@@ -160,7 +160,7 @@ public class TezUtilsInternal {
LOG.info("Redirecting log file based on addend: " + addend);
- Appender appender = Logger.getRootLogger().getAppender(
+ Appender appender = org.apache.log4j.Logger.getRootLogger().getAppender(
TezConstants.TEZ_CONTAINER_LOGGER_NAME);
if (appender != null) {
if (appender instanceof TezContainerLogAppender) {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-common/src/test/java/org/apache/tez/dag/records/TestTezIds.java
----------------------------------------------------------------------
diff --git a/tez-common/src/test/java/org/apache/tez/dag/records/TestTezIds.java b/tez-common/src/test/java/org/apache/tez/dag/records/TestTezIds.java
index 3b582d1..41d6d0f 100644
--- a/tez-common/src/test/java/org/apache/tez/dag/records/TestTezIds.java
+++ b/tez-common/src/test/java/org/apache/tez/dag/records/TestTezIds.java
@@ -18,15 +18,15 @@
package org.apache.tez.dag.records;
-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.ApplicationId;
import org.junit.Assert;
import org.junit.Test;
public class TestTezIds {
- private static final Log LOG = LogFactory.getLog(TestTezIds.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestTezIds.class);
private void verifyDagInfo(String[] splits, TezDAGID dagId) {
Assert.assertEquals(dagId.getApplicationId().getClusterTimestamp(),
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/pom.xml
----------------------------------------------------------------------
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index d24b383..97de918 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -86,18 +86,14 @@
<artifactId>commons-math3</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
index 36301fb..b5889a9 100644
--- a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
+++ b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationReport;
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
import org.apache.hadoop.yarn.util.SystemClock;
-import org.apache.log4j.Logger;
import org.apache.tez.common.TezCommonUtils;
import org.apache.tez.dag.api.TezConfiguration;
import org.apache.tez.dag.api.TezException;
@@ -52,11 +51,13 @@ import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.DAGAppMaster;
import org.apache.tez.dag.app.DAGAppMasterState;
import org.apache.tez.dag.app.dag.DAG;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
public class LocalClient extends FrameworkClient {
- public static final Logger LOG = Logger.getLogger(LocalClient.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LocalClient.class);
private volatile DAGAppMaster dagAppMaster = null;
private volatile DAGClientHandler clientHandler = null;
@@ -244,7 +245,7 @@ public class LocalClient extends FrameworkClient {
}
}
} catch (Throwable t) {
- LOG.fatal("Error starting DAGAppMaster", t);
+ LOG.error("Error starting DAGAppMaster", t);
if (dagAmThread != null) {
dagAmThread.interrupt();
}
@@ -305,7 +306,7 @@ public class LocalClient extends FrameworkClient {
DAGAppMaster.initAndStartAppMaster(dagAppMaster, conf);
} catch (Throwable t) {
- LOG.fatal("Error starting DAGAppMaster", t);
+ LOG.error("Error starting DAGAppMaster", t);
if (dagAppMaster != null) {
dagAppMaster.stop();
}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
index e40b208..9d35d76 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-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.LocalResource;
import org.apache.tez.client.TezAppMasterStatus;
import org.apache.tez.dag.api.DAGNotRunningException;
@@ -37,7 +37,7 @@ import org.apache.tez.dag.records.TezDAGID;
public class DAGClientHandler {
- private Log LOG = LogFactory.getLog(DAGClientHandler.class);
+ private Logger LOG = LoggerFactory.getLogger(DAGClientHandler.class);
private DAGAppMaster dagAppMaster;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
index 7671ddf..029761c 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
-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.ipc.ProtobufRpcEngine;
@@ -44,7 +44,7 @@ import org.apache.tez.dag.app.security.authorize.TezAMPolicyProvider;
import com.google.protobuf.BlockingService;
public class DAGClientServer extends AbstractService {
- static final Log LOG = LogFactory.getLog(DAGClientServer.class);
+ static final Logger LOG = LoggerFactory.getLogger(DAGClientServer.class);
ClientToAMTokenSecretManager secretManager;
DAGClientHandler realInstance;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/ContainerContext.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/ContainerContext.java b/tez-dag/src/main/java/org/apache/tez/dag/app/ContainerContext.java
index cf688b3..e7f1a10 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/ContainerContext.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/ContainerContext.java
@@ -23,8 +23,8 @@ import java.util.Map;
import java.util.Map.Entry;
import javax.annotation.Nullable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.LocalResourceType;
@@ -34,7 +34,7 @@ import com.google.common.base.Preconditions;
public class ContainerContext {
- private static final Log LOG = LogFactory.getLog(ContainerContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ContainerContext.class);
private final Map<String, LocalResource> localResources;
private final Credentials credentials;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index 38a3692..e0351b0 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -57,8 +57,8 @@ import java.util.regex.Pattern;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.GnuParser;
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.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -189,7 +189,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@SuppressWarnings("rawtypes")
public class DAGAppMaster extends AbstractService {
- private static final Log LOG = LogFactory.getLog(DAGAppMaster.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGAppMaster.class);
/**
* Priority of the DAGAppMaster shutdown hook.
@@ -384,7 +384,7 @@ public class DAGAppMaster extends AbstractService {
LOG.warn("Ignoring client-AM version mismatch as check disabled. "
+ versionMismatchDiagnostics);
} else {
- LOG.fatal(versionMismatchDiagnostics);
+ LOG.error(versionMismatchDiagnostics);
versionMismatch = true;
}
}
@@ -651,7 +651,7 @@ public class DAGAppMaster extends AbstractService {
}
// This is a pass-through. Kill the AM if DAG state is ERROR.
default:
- LOG.fatal("Received a DAG Finished Event with state="
+ LOG.error("Received a DAG Finished Event with state="
+ finishEvt.getDAGState()
+ ". Error. Shutting down.");
state = DAGAppMasterState.ERROR;
@@ -1584,7 +1584,7 @@ public class DAGAppMaster extends AbstractService {
if (LOG.isDebugEnabled()) {
LOG.debug("Stopping service : " + service);
}
- Exception ex = ServiceOperations.stopQuietly(LOG, service);
+ Exception ex = ServiceOperations.stopQuietly(service);
if (ex != null && firstException == null) {
LOG.warn("Failed to stop service, name=" + service.getName(), ex);
firstException = ex;
@@ -1938,7 +1938,7 @@ public class DAGAppMaster extends AbstractService {
initAndStartAppMaster(appMaster, conf);
} catch (Throwable t) {
- LOG.fatal("Error starting DAGAppMaster", t);
+ LOG.error("Error starting DAGAppMaster", t);
System.exit(1);
}
}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java b/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
index 1dabe27..21683b0 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/RecoveryParser.java
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-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;
@@ -75,7 +75,7 @@ import com.google.common.annotations.VisibleForTesting;
public class RecoveryParser {
- private static final Log LOG = LogFactory.getLog(RecoveryParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RecoveryParser.class);
private final DAGAppMaster dagAppMaster;
private final FileSystem recoveryFS;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
index 4cb5e99..a01ca39 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
@@ -28,8 +28,8 @@ import java.util.Map.Entry;
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.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.ipc.ProtocolSignature;
@@ -71,8 +71,8 @@ public class TaskAttemptListenerImpTezDag extends AbstractService implements
private static final ContainerTask TASK_FOR_INVALID_JVM = new ContainerTask(
null, true, null, null, false);
- private static final Log LOG = LogFactory
- .getLog(TaskAttemptListenerImpTezDag.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(TaskAttemptListenerImpTezDag.class);
private final AppContext context;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/RootInputInitializerManager.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/RootInputInitializerManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/RootInputInitializerManager.java
index 26d5306..7156e60 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/RootInputInitializerManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/RootInputInitializerManager.java
@@ -39,8 +39,8 @@ import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
-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.security.UserGroupInformation;
import org.apache.hadoop.yarn.event.EventHandler;
@@ -77,7 +77,7 @@ import org.apache.tez.runtime.api.impl.TezEvent;
public class RootInputInitializerManager {
- private static final Log LOG = LogFactory.getLog(RootInputInitializerManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RootInputInitializerManager.class);
private final ExecutorService rawExecutor;
private final ListeningExecutorService executor;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
index c469013..37ed365 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
@@ -39,8 +39,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-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.Credentials;
@@ -133,7 +133,7 @@ import com.google.common.collect.Sets;
public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
EventHandler<DAGEvent> {
- private static final Log LOG = LogFactory.getLog(DAGImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGImpl.class);
private static final String LINE_SEPARATOR = System
.getProperty("line.separator");
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrder.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrder.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrder.java
index 253d410..8d42227 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrder.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrder.java
@@ -18,8 +18,8 @@
package org.apache.tez.dag.app.dag.impl;
-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.EventHandler;
import org.apache.tez.dag.app.dag.DAG;
import org.apache.tez.dag.app.dag.DAGScheduler;
@@ -32,8 +32,8 @@ import org.apache.tez.dag.app.dag.event.TaskAttemptEventSchedule;
@SuppressWarnings("rawtypes")
public class DAGSchedulerNaturalOrder implements DAGScheduler {
- private static final Log LOG =
- LogFactory.getLog(DAGSchedulerNaturalOrder.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(DAGSchedulerNaturalOrder.class);
private final DAG dag;
private final EventHandler handler;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrderControlled.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrderControlled.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrderControlled.java
index 7cfbf5a..2469a2f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrderControlled.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGSchedulerNaturalOrderControlled.java
@@ -28,8 +28,8 @@ import java.util.Set;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
-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.EventHandler;
import org.apache.tez.dag.app.dag.DAG;
import org.apache.tez.dag.app.dag.DAGScheduler;
@@ -52,8 +52,8 @@ import org.apache.tez.dag.records.TezTaskAttemptID;
@SuppressWarnings("rawtypes")
public class DAGSchedulerNaturalOrderControlled implements DAGScheduler {
- private static final Log LOG =
- LogFactory.getLog(DAGSchedulerNaturalOrderControlled.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(DAGSchedulerNaturalOrderControlled.class);
private final DAG dag;
private final EventHandler handler;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
index d6f4477..ffdff80 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-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.EventHandler;
import org.apache.tez.common.ReflectionUtils;
import org.apache.tez.dag.api.EdgeManagerPlugin;
@@ -57,7 +57,7 @@ import com.google.common.collect.Maps;
public class Edge {
- private static final Log LOG = LogFactory.getLog(Edge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Edge.class);
class EdgeManagerPluginContextImpl implements EdgeManagerPluginContext {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexManager.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexManager.java
index 49900dd..5e179bd 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexManager.java
@@ -22,8 +22,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.dag.api.EdgeProperty;
import org.apache.tez.dag.api.InputDescriptor;
import org.apache.tez.dag.api.VertexManagerPlugin;
@@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class ImmediateStartVertexManager extends VertexManagerPlugin {
- private static final Log LOG = LogFactory.getLog(ImmediateStartVertexManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ImmediateStartVertexManager.class);
private final Map<String, Boolean> srcVertexConfigured = Maps.newConcurrentMap();
private int managedTasks;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
index 4a4506e..4f92fa6 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
@@ -31,8 +31,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-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.net.NetUtils;
import org.apache.hadoop.util.StringInterner;
@@ -115,7 +115,7 @@ public class TaskAttemptImpl implements TaskAttempt,
// TODO Ensure MAPREDUCE-4457 is factored in. Also MAPREDUCE-4068.
// TODO Consider TAL registration in the TaskAttempt instead of the container.
- private static final Log LOG = LogFactory.getLog(TaskAttemptImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskAttemptImpl.class);
private static final String LINE_SEPARATOR = System
.getProperty("line.separator");
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImplHelpers.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImplHelpers.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImplHelpers.java
index 5d854e2..9e4f2b4 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImplHelpers.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImplHelpers.java
@@ -22,12 +22,12 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TaskAttemptImplHelpers {
- private static final Log LOG = LogFactory.getLog(TaskAttemptImplHelpers.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskAttemptImplHelpers.class);
static String[] resolveHosts(String[] src) {
String[] result = new String[src.length];
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
index 125eeed..8290cf5 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
@@ -35,8 +35,8 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Maps;
import org.apache.commons.lang.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.yarn.api.records.ContainerId;
@@ -105,7 +105,7 @@ import org.apache.tez.state.StateMachineTez;
@SuppressWarnings({ "rawtypes", "unchecked" })
public class TaskImpl implements Task, EventHandler<TaskEvent> {
- private static final Log LOG = LogFactory.getLog(TaskImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskImpl.class);
private static final String LINE_SEPARATOR = System
.getProperty("line.separator");
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index 145170c..b254c8a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -43,8 +43,6 @@ import com.google.common.base.Strings;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
@@ -179,6 +177,8 @@ import com.google.common.collect.Sets;
import org.apache.tez.state.OnStateChangedCallback;
import org.apache.tez.state.StateMachineTez;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** Implementation of Vertex interface. Maintains the state machines of Vertex.
* The read and write calls use ReadWriteLock for concurrency.
@@ -190,7 +190,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
private static final String LINE_SEPARATOR = System
.getProperty("line.separator");
- private static final Log LOG = LogFactory.getLog(VertexImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(VertexImpl.class);
//final fields
private final Clock clock;
@@ -2118,7 +2118,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
}
if (hasBipartite && inputsWithInitializers != null) {
- LOG.fatal("A vertex with an Initial Input and a Shuffle Input are not supported at the moment");
+ LOG.error("A vertex with an Initial Input and a Shuffle Input are not supported at the moment");
if (event != null) {
return VertexState.FAILED;
} else {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
index af92348..95d714b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
@@ -33,8 +33,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nullable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.Resource;
@@ -98,7 +98,7 @@ public class VertexManager {
private final AtomicBoolean eventInFlight;
private final AtomicBoolean pluginFailed;
- private static final Log LOG = LogFactory.getLog(VertexManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(VertexManager.class);
private final VertexManagerCallback VM_CALLBACK = new VertexManagerCallback();
class VertexManagerPluginContextImpl implements VertexManagerPluginContext, VertexStateUpdateListener {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/dag/speculation/legacy/LegacySpeculator.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/speculation/legacy/LegacySpeculator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/speculation/legacy/LegacySpeculator.java
index 2cc3165..dd54d86 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/speculation/legacy/LegacySpeculator.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/speculation/legacy/LegacySpeculator.java
@@ -24,8 +24,8 @@ import java.util.Set;
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.conf.Configuration;
import org.apache.hadoop.yarn.util.Clock;
import org.apache.tez.dag.api.oldrecords.TaskAttemptState;
@@ -68,7 +68,7 @@ public class LegacySpeculator {
private static final double PROPORTION_TOTAL_TASKS_SPECULATABLE = 0.01;
private static final int MINIMUM_ALLOWED_SPECULATIVE_TASKS = 10;
- private static final Log LOG = LogFactory.getLog(LegacySpeculator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LegacySpeculator.class);
private final ConcurrentMap<TezTaskID, Boolean> runningTasks
= new ConcurrentHashMap<TezTaskID, Boolean>();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
index 67832fa..cb8e262 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
@@ -30,8 +30,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.lang.exception.ExceptionUtils;
-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.service.AbstractService;
@@ -74,7 +74,7 @@ public class ContainerLauncherImpl extends AbstractService implements
ContainerLauncher {
// TODO XXX Ensure the same thread is used to launch / stop the same container. Or - ensure event ordering.
- static final Log LOG = LogFactory.getLog(ContainerLauncherImpl.class);
+ static final Logger LOG = LoggerFactory.getLogger(ContainerLauncherImpl.class);
private ConcurrentHashMap<ContainerId, Container> containers =
new ConcurrentHashMap<ContainerId, Container>();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
index d94849a..7f5a7b1 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java
@@ -43,8 +43,8 @@ import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-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.security.Credentials;
import org.apache.hadoop.service.AbstractService;
@@ -83,7 +83,7 @@ import org.apache.tez.runtime.task.TezChild;
public class LocalContainerLauncher extends AbstractService implements
ContainerLauncher {
- private static final Log LOG = LogFactory.getLog(LocalContainerLauncher.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LocalContainerLauncher.class);
private final AppContext context;
private final TaskAttemptListener taskAttemptListener;
private final AtomicBoolean serviceStopped = new AtomicBoolean(false);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/LocalTaskSchedulerService.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/LocalTaskSchedulerService.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/LocalTaskSchedulerService.java
index b52d65f..ce01bfb 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/LocalTaskSchedulerService.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/LocalTaskSchedulerService.java
@@ -30,8 +30,8 @@ import java.util.LinkedHashMap;
import com.google.common.primitives.Ints;
-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.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.Container;
@@ -48,7 +48,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
public class LocalTaskSchedulerService extends TaskSchedulerService {
- private static final Log LOG = LogFactory.getLog(LocalTaskSchedulerService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LocalTaskSchedulerService.class);
final TaskSchedulerAppCallback realAppClient;
final TaskSchedulerAppCallback appClientDelegate;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
index c9471f7..0985d58 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
@@ -29,8 +29,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
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.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
@@ -82,7 +82,7 @@ import com.google.common.base.Preconditions;
public class TaskSchedulerEventHandler extends AbstractService
implements TaskSchedulerAppCallback,
EventHandler<AMSchedulerEvent> {
- static final Log LOG = LogFactory.getLog(TaskSchedulerEventHandler.class);
+ static final Logger LOG = LoggerFactory.getLogger(TaskSchedulerEventHandler.class);
static final String APPLICATION_ID_PLACEHOLDER = "__APPLICATION_ID__";
static final String HISTORY_URL_BASE = "__HISTORY_URL_BASE__";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TezAMRMClientAsync.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TezAMRMClientAsync.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TezAMRMClientAsync.java
index dad9473..7b3df84 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TezAMRMClientAsync.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TezAMRMClientAsync.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
-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.NodeId;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
@@ -39,7 +39,7 @@ import org.apache.hadoop.yarn.client.api.impl.AMRMClientImpl;
public class TezAMRMClientAsync<T extends ContainerRequest> extends AMRMClientAsyncImpl<T> {
- private static final Log LOG = LogFactory.getLog(TezAMRMClientAsync.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezAMRMClientAsync.class);
/**
* Used to track the type of requests at a given priority.
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
index a17d5e6..4818b92 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
@@ -37,8 +37,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-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.random.RandomDataGenerator;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
@@ -81,7 +81,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
*/
public class YarnTaskSchedulerService extends TaskSchedulerService
implements AMRMClientAsync.CallbackHandler {
- private static final Log LOG = LogFactory.getLog(YarnTaskSchedulerService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(YarnTaskSchedulerService.class);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
index d1b2ea8..41e814b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
-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.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -58,7 +58,7 @@ import com.google.common.annotations.VisibleForTesting;
public class AMContainerHelpers {
- private static final Log LOG = LogFactory.getLog(AMContainerHelpers.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AMContainerHelpers.class);
private static Object commonContainerSpecLock = new Object();
private static TezDAGID lastDAGID = null;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
index 201ae9f..330f2b7 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
@@ -27,8 +27,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
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.security.Credentials;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
@@ -68,7 +68,7 @@ import com.google.common.base.Preconditions;
@SuppressWarnings("rawtypes")
public class AMContainerImpl implements AMContainer {
- private static final Log LOG = LogFactory.getLog(AMContainerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AMContainerImpl.class);
private final ReadLock readLock;
private final WriteLock writeLock;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerMap.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerMap.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerMap.java
index 46e4864..6037a3a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerMap.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerMap.java
@@ -21,8 +21,8 @@ package org.apache.tez.dag.app.rm.container;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -33,7 +33,7 @@ import org.apache.tez.dag.app.TaskAttemptListener;
public class AMContainerMap extends AbstractService implements EventHandler<AMContainerEvent> {
- private static final Log LOG = LogFactory.getLog(AMContainerMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AMContainerMap.class);
private final ContainerHeartbeatHandler chh;
private final TaskAttemptListener tal;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
index 6358c04..b93cab3 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
@@ -26,8 +26,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
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.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.hadoop.yarn.event.Event;
@@ -49,7 +49,7 @@ import com.google.common.collect.Sets;
public class AMNodeImpl implements AMNode {
- private static final Log LOG = LogFactory.getLog(AMNodeImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AMNodeImpl.class);
private final ReadLock readLock;
private final WriteLock writeLock;