TEZ-2241. Miscellaneous fixes after last reabse. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b3470a13 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b3470a13 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b3470a13 Branch: refs/heads/TEZ-2003 Commit: b3470a131935a44fd8659f9ef700d4ede51d5293 Parents: 9cc2acc Author: Siddharth Seth <[email protected]> Authored: Thu Mar 26 17:57:55 2015 -0700 Committer: Siddharth Seth <[email protected]> Committed: Thu Aug 6 01:25:09 2015 -0700 ---------------------------------------------------------------------- TEZ-2003-CHANGES.txt | 1 + .../org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java | 2 ++ .../org/apache/tez/dag/app/TezLocalTaskCommunicatorImpl.java | 6 +++--- .../java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java | 6 +++--- .../apache/tez/dag/app/launcher/ContainerLauncherRouter.java | 6 +++--- .../test/java/org/apache/tez/dag/app/MockDAGAppMaster.java | 2 +- tez-ext-service-tests/pom.xml | 4 ++-- .../tez/dag/app/launcher/TezTestServiceContainerLauncher.java | 6 +++--- .../dag/app/launcher/TezTestServiceNoOpContainerLauncher.java | 6 +++--- .../tez/dag/app/rm/TezTestServiceTaskSchedulerService.java | 7 ++++--- .../dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java | 7 ++++--- .../org/apache/tez/service/MiniTezTestServiceCluster.java | 6 +++--- .../java/org/apache/tez/service/impl/ContainerRunnerImpl.java | 5 +++-- .../test/java/org/apache/tez/service/impl/TezTestService.java | 4 ++-- .../tez/service/impl/TezTestServiceProtocolServerImpl.java | 6 +++--- .../org/apache/tez/shufflehandler/FadvisedChunkedFile.java | 6 +++--- .../org/apache/tez/shufflehandler/FadvisedFileRegion.java | 6 +++--- .../test/java/org/apache/tez/shufflehandler/IndexCache.java | 6 +++--- .../java/org/apache/tez/shufflehandler/ShuffleHandler.java | 6 +++--- .../java/org/apache/tez/tests/TestExternalTezServices.java | 6 +++--- 20 files changed, 55 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/TEZ-2003-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-2003-CHANGES.txt b/TEZ-2003-CHANGES.txt index 774a685..d51686d 100644 --- a/TEZ-2003-CHANGES.txt +++ b/TEZ-2003-CHANGES.txt @@ -11,5 +11,6 @@ ALL CHANGES: TEZ-2139. Update tez version to 0.7.0-TEZ-2003-SNAPSHOT. TEZ-2175. Task priority should be available to the TaskCommunicator plugin. TEZ-2187. Allow TaskCommunicators to report failed / killed attempts. + TEZ-2241. Miscellaneous fixes after last reabse. INCOMPATIBLE CHANGES: http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/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 e13cc6b..3798b6f 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 @@ -66,6 +66,8 @@ import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.dag.records.TezVertexID; import org.apache.tez.runtime.api.impl.TezEvent; import org.apache.tez.common.security.JobTokenSecretManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-dag/src/main/java/org/apache/tez/dag/app/TezLocalTaskCommunicatorImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TezLocalTaskCommunicatorImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/TezLocalTaskCommunicatorImpl.java index 3704cc4..47688d1 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/TezLocalTaskCommunicatorImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TezLocalTaskCommunicatorImpl.java @@ -18,14 +18,14 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.tez.dag.api.TaskCommunicatorContext; import org.apache.tez.dag.api.TezUncheckedException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TezLocalTaskCommunicatorImpl extends TezTaskCommunicatorImpl { - private static final Log LOG = LogFactory.getLog(TezLocalTaskCommunicatorImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(TezLocalTaskCommunicatorImpl.class); public TezLocalTaskCommunicatorImpl( TaskCommunicatorContext taskCommunicatorContext) { http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java index 92b5b6c..bba06fd 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java @@ -23,8 +23,6 @@ import java.util.concurrent.ConcurrentMap; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -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.fs.CommonConfigurationKeysPublic; @@ -55,11 +53,13 @@ import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.runtime.api.impl.TaskSpec; import org.apache.tez.runtime.api.impl.TezHeartbeatRequest; import org.apache.tez.runtime.api.impl.TezHeartbeatResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @InterfaceAudience.Private public class TezTaskCommunicatorImpl extends TaskCommunicator { - private static final Log LOG = LogFactory.getLog(TezTaskCommunicatorImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(TezTaskCommunicatorImpl.class); private static final ContainerTask TASK_FOR_INVALID_JVM = new ContainerTask( null, true, null, null, false); http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherRouter.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherRouter.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherRouter.java index 70b0cbc..dd3571e 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherRouter.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherRouter.java @@ -19,8 +19,6 @@ import java.lang.reflect.InvocationTargetException; import java.net.UnknownHostException; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.event.EventHandler; @@ -30,11 +28,13 @@ import org.apache.tez.dag.api.TezUncheckedException; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; import org.apache.tez.dag.app.rm.NMCommunicatorEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ContainerLauncherRouter extends AbstractService implements EventHandler<NMCommunicatorEvent> { - static final Log LOG = LogFactory.getLog(ContainerLauncherImpl.class); + static final Logger LOG = LoggerFactory.getLogger(ContainerLauncherImpl.class); private final ContainerLauncher containerLaunchers[]; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java b/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java index 7f45ee6..b39eee2 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java @@ -342,7 +342,7 @@ public class MockDAGAppMaster extends DAGAppMaster { long startTime = System.nanoTime(); long startCpuTime = threadMxBean.getCurrentThreadCpuTime(); TaskHeartbeatResponse response = taListener.heartbeat(request); - if (response.shouldDie()) { + if (response.isShouldDie()) { cData.remove(); } else { cData.nextFromEventId = response.getNextFromEventId(); http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml index 1113341..907e129 100644 --- a/tez-ext-service-tests/pom.xml +++ b/tez-ext-service-tests/pom.xml @@ -28,8 +28,8 @@ <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceContainerLauncher.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceContainerLauncher.java b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceContainerLauncher.java index cb6308c..9d22196 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceContainerLauncher.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceContainerLauncher.java @@ -18,8 +18,6 @@ import java.net.InetSocketAddress; 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.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.api.ApplicationConstants; @@ -40,6 +38,8 @@ import org.apache.tez.dag.history.events.ContainerLaunchedEvent; import org.apache.tez.service.TezTestServiceConfConstants; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.RunContainerRequestProto; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TezTestServiceContainerLauncher extends AbstractService implements ContainerLauncher { @@ -47,7 +47,7 @@ public class TezTestServiceContainerLauncher extends AbstractService implements // TODO May need multiple connections per target machine, depending upon how synchronization is handled in the RPC layer - static final Log LOG = LogFactory.getLog(TezTestServiceContainerLauncher.class); + static final Logger LOG = LoggerFactory.getLogger(TezTestServiceContainerLauncher.class); private final AppContext context; private final String tokenIdentifier; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceNoOpContainerLauncher.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceNoOpContainerLauncher.java b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceNoOpContainerLauncher.java index 8c8e486..977d0d3 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceNoOpContainerLauncher.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/launcher/TezTestServiceNoOpContainerLauncher.java @@ -14,8 +14,6 @@ package org.apache.tez.dag.app.launcher; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.util.Clock; @@ -28,10 +26,12 @@ import org.apache.tez.dag.app.rm.container.AMContainerEventLaunched; import org.apache.tez.dag.app.rm.container.AMContainerEventType; import org.apache.tez.dag.history.DAGHistoryEvent; import org.apache.tez.dag.history.events.ContainerLaunchedEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TezTestServiceNoOpContainerLauncher extends AbstractService implements ContainerLauncher { - static final Log LOG = LogFactory.getLog(TezTestServiceNoOpContainerLauncher.class); + static final Logger LOG = LoggerFactory.getLogger(TezTestServiceNoOpContainerLauncher.class); private final AppContext context; private final Clock clock; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/rm/TezTestServiceTaskSchedulerService.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/rm/TezTestServiceTaskSchedulerService.java b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/rm/TezTestServiceTaskSchedulerService.java index 872d592..50dfb24 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/rm/TezTestServiceTaskSchedulerService.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/rm/TezTestServiceTaskSchedulerService.java @@ -28,8 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; @@ -41,11 +39,14 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.tez.dag.api.TaskAttemptEndReason; import org.apache.tez.dag.app.AppContext; import org.apache.tez.service.TezTestServiceConfConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TezTestServiceTaskSchedulerService extends TaskSchedulerService { - private static final Log LOG = LogFactory.getLog(TezTestServiceTaskSchedulerService.class); + private static final Logger + LOG = LoggerFactory.getLogger(TezTestServiceTaskSchedulerService.class); private final ExecutorService appCallbackExecutor; private final TaskSchedulerAppCallback appClientDelegate; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java index e3385a2..ef983c2 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java @@ -23,8 +23,6 @@ import java.util.concurrent.RejectedExecutionException; import com.google.protobuf.ByteString; import com.google.protobuf.ServiceException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.ipc.RemoteException; @@ -41,11 +39,14 @@ import org.apache.tez.runtime.api.impl.TaskSpec; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.SubmitWorkRequestProto; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.SubmitWorkResponseProto; import org.apache.tez.util.ProtoConverters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TezTestServiceTaskCommunicatorImpl extends TezTaskCommunicatorImpl { - private static final Log LOG = LogFactory.getLog(TezTestServiceTaskCommunicatorImpl.class); + private static final Logger + LOG = LoggerFactory.getLogger(TezTestServiceTaskCommunicatorImpl.class); private final TezTestServiceCommunicator communicator; private final SubmitWorkRequestProto BASE_SUBMIT_WORK_REQUEST; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/service/MiniTezTestServiceCluster.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/service/MiniTezTestServiceCluster.java b/tez-ext-service-tests/src/test/java/org/apache/tez/service/MiniTezTestServiceCluster.java index 0ac0b33..c5ff02d 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/service/MiniTezTestServiceCluster.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/service/MiniTezTestServiceCluster.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.net.InetSocketAddress; import com.google.common.base.Preconditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.Path; @@ -28,10 +26,12 @@ import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.util.Shell; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.tez.service.impl.TezTestService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MiniTezTestServiceCluster extends AbstractService { - private static final Log LOG = LogFactory.getLog(MiniTezTestServiceCluster.class); + private static final Logger LOG = LoggerFactory.getLogger(MiniTezTestServiceCluster.class); private final File testWorkDir; private final long availableMemory; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/ContainerRunnerImpl.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/ContainerRunnerImpl.java b/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/ContainerRunnerImpl.java index 379d952..e7c02c8 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/ContainerRunnerImpl.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/ContainerRunnerImpl.java @@ -52,7 +52,6 @@ import org.apache.hadoop.security.token.Token; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.api.ApplicationConstants; import org.apache.hadoop.yarn.util.AuxiliaryServiceHelper; -import org.apache.log4j.Logger; import org.apache.tez.common.TezCommonUtils; import org.apache.tez.common.TezTaskUmbilicalProtocol; import org.apache.tez.common.security.JobTokenIdentifier; @@ -75,10 +74,12 @@ import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.RunContainer import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.SubmitWorkRequestProto; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.TaskSpecProto; import org.apache.tez.util.ProtoConverters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ContainerRunnerImpl extends AbstractService implements ContainerRunner { - private static final Logger LOG = Logger.getLogger(ContainerRunnerImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(ContainerRunnerImpl.class); public static final String DAG_NAME_INSTRUMENTED_FAILURES = "InstrumentedFailures"; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestService.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestService.java b/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestService.java index 855f1b0..322be00 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestService.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestService.java @@ -23,16 +23,16 @@ import com.google.common.base.Preconditions; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.util.StringUtils; -import org.apache.log4j.Logger; import org.apache.tez.dag.api.TezException; import org.apache.tez.service.ContainerRunner; import org.apache.tez.shufflehandler.ShuffleHandler; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.RunContainerRequestProto; +import org.slf4j.LoggerFactory; public class TezTestService extends AbstractService implements ContainerRunner { - private static final Logger LOG = Logger.getLogger(TezTestService.class); + private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(TezTestService.class); private final Configuration shuffleHandlerConf; private final int numExecutors; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestServiceProtocolServerImpl.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestServiceProtocolServerImpl.java b/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestServiceProtocolServerImpl.java index 39d7156..b5d3f83 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestServiceProtocolServerImpl.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/service/impl/TezTestServiceProtocolServerImpl.java @@ -22,8 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.BlockingService; import com.google.protobuf.RpcController; import com.google.protobuf.ServiceException; -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.ipc.ProtobufRpcEngine; @@ -38,11 +36,13 @@ import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.RunContainer import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.RunContainerResponseProto; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.SubmitWorkRequestProto; import org.apache.tez.test.service.rpc.TezTestServiceProtocolProtos.SubmitWorkResponseProto; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TezTestServiceProtocolServerImpl extends AbstractService implements TezTestServiceProtocolBlockingPB { - private static final Log LOG = LogFactory.getLog(TezTestServiceProtocolServerImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(TezTestServiceProtocolServerImpl.class); private final ContainerRunner containerRunner; private RPC.Server server; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedChunkedFile.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedChunkedFile.java b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedChunkedFile.java index 65588fe..294add6 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedChunkedFile.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedChunkedFile.java @@ -18,16 +18,16 @@ import java.io.FileDescriptor; import java.io.IOException; import java.io.RandomAccessFile; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.ReadaheadPool; import org.apache.hadoop.io.ReadaheadPool.ReadaheadRequest; import org.apache.hadoop.io.nativeio.NativeIO; import org.jboss.netty.handler.stream.ChunkedFile; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FadvisedChunkedFile extends ChunkedFile { - private static final Log LOG = LogFactory.getLog(FadvisedChunkedFile.class); + private static final Logger LOG = LoggerFactory.getLogger(FadvisedChunkedFile.class); private final boolean manageOsCache; private final int readaheadLength; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedFileRegion.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedFileRegion.java b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedFileRegion.java index bdffe52..e5392d3 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedFileRegion.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/FadvisedFileRegion.java @@ -22,16 +22,16 @@ import java.nio.channels.FileChannel; import java.nio.channels.WritableByteChannel; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.ReadaheadPool; import org.apache.hadoop.io.ReadaheadPool.ReadaheadRequest; import org.apache.hadoop.io.nativeio.NativeIO; import org.jboss.netty.channel.DefaultFileRegion; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FadvisedFileRegion extends DefaultFileRegion { - private static final Log LOG = LogFactory.getLog(FadvisedFileRegion.class); + private static final Logger LOG = LoggerFactory.getLogger(FadvisedFileRegion.class); private final boolean manageOsCache; private final int readaheadLength; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/IndexCache.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/IndexCache.java b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/IndexCache.java index 9a51ca0..5a45917 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/IndexCache.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/IndexCache.java @@ -22,20 +22,20 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.tez.runtime.library.common.Constants; import org.apache.tez.runtime.library.common.sort.impl.TezIndexRecord; import org.apache.tez.runtime.library.common.sort.impl.TezSpillRecord; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class IndexCache { private final Configuration conf; private final int totalMemoryAllowed; private AtomicInteger totalMemoryUsed = new AtomicInteger(); - private static final Log LOG = LogFactory.getLog(IndexCache.class); + private static final Logger LOG = LoggerFactory.getLogger(IndexCache.class); private final ConcurrentHashMap<String,IndexInformation> cache = new ConcurrentHashMap<String,IndexInformation>(); http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/ShuffleHandler.java b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/ShuffleHandler.java index cc82d74..8cbb8c7 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/ShuffleHandler.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/shufflehandler/ShuffleHandler.java @@ -51,8 +51,6 @@ import java.util.regex.Pattern; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.LocalDirAllocator; import org.apache.hadoop.fs.Path; @@ -105,10 +103,12 @@ import org.jboss.netty.handler.codec.http.QueryStringDecoder; import org.jboss.netty.handler.ssl.SslHandler; import org.jboss.netty.handler.stream.ChunkedWriteHandler; import org.jboss.netty.util.CharsetUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ShuffleHandler { - private static final Log LOG = LogFactory.getLog(ShuffleHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ShuffleHandler.class); public static final String SHUFFLE_HANDLER_LOCAL_DIRS = "tez.shuffle.handler.local-dirs"; http://git-wip-us.apache.org/repos/asf/tez/blob/b3470a13/tez-ext-service-tests/src/test/java/org/apache/tez/tests/TestExternalTezServices.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/tests/TestExternalTezServices.java b/tez-ext-service-tests/src/test/java/org/apache/tez/tests/TestExternalTezServices.java index b6a166d..4d0a610 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/tests/TestExternalTezServices.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/tests/TestExternalTezServices.java @@ -20,8 +20,6 @@ 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.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -48,10 +46,12 @@ import org.apache.tez.test.MiniTezCluster; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestExternalTezServices { - private static final Log LOG = LogFactory.getLog(TestExternalTezServices.class); + private static final Logger LOG = LoggerFactory.getLogger(TestExternalTezServices.class); private static final String EXT_PUSH_ENTITY_NAME = "ExtServiceTestPush";
