YARN-7379. Moving logging APIs over to slf4j in hadoop-yarn-client. Contributed by Yeliang Cang.
This commit is contained in:
parent
785f1b0d11
commit
c02d2ba50d
|
@ -23,8 +23,6 @@ import java.util.Collection;
|
|||
import java.util.function.Supplier;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Public;
|
||||
|
@ -48,12 +46,15 @@ import org.apache.hadoop.yarn.util.resource.Resources;
|
|||
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Stable
|
||||
public abstract class AMRMClient<T extends AMRMClient.ContainerRequest> extends
|
||||
AbstractService {
|
||||
private static final Log LOG = LogFactory.getLog(AMRMClient.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(AMRMClient.class);
|
||||
|
||||
private TimelineV2Client timelineV2Client;
|
||||
|
||||
|
|
|
@ -24,8 +24,6 @@ import java.util.List;
|
|||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Public;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Stable;
|
||||
|
@ -53,6 +51,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
|
|||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.base.Preconditions;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* <code>AMRMClientAsync</code> handles communication with the ResourceManager
|
||||
|
@ -107,7 +107,8 @@ import com.google.common.base.Preconditions;
|
|||
@Stable
|
||||
public abstract class AMRMClientAsync<T extends ContainerRequest>
|
||||
extends AbstractService {
|
||||
private static final Log LOG = LogFactory.getLog(AMRMClientAsync.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(AMRMClientAsync.class);
|
||||
|
||||
protected final AMRMClient<T> client;
|
||||
protected final CallbackHandler handler;
|
||||
|
|
|
@ -25,8 +25,6 @@ import java.util.List;
|
|||
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.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -51,13 +49,16 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
|
|||
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@Private
|
||||
@Unstable
|
||||
public class AMRMClientAsyncImpl<T extends ContainerRequest>
|
||||
extends AMRMClientAsync<T> {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(AMRMClientAsyncImpl.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(AMRMClientAsyncImpl.class);
|
||||
|
||||
private final HeartbeatThread heartbeatThread;
|
||||
private final CallbackHandlerThread handlerThread;
|
||||
|
|
|
@ -36,8 +36,6 @@ 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.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -63,12 +61,15 @@ import org.apache.hadoop.yarn.state.StateMachineFactory;
|
|||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@Private
|
||||
@Unstable
|
||||
public class NMClientAsyncImpl extends NMClientAsync {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(NMClientAsyncImpl.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(NMClientAsyncImpl.class);
|
||||
|
||||
protected static final int INITIAL_THREAD_POOL_SIZE = 10;
|
||||
|
||||
|
|
|
@ -34,8 +34,6 @@ import java.util.Set;
|
|||
import java.util.TreeSet;
|
||||
import java.util.AbstractMap.SimpleEntry;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -80,12 +78,15 @@ import com.google.common.annotations.VisibleForTesting;
|
|||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Preconditions;
|
||||
import org.apache.hadoop.yarn.util.resource.Resources;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@Private
|
||||
@Unstable
|
||||
public class AMRMClientImpl<T extends ContainerRequest> extends AMRMClient<T> {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(AMRMClientImpl.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(AMRMClientImpl.class);
|
||||
private static final List<String> ANY_LIST =
|
||||
Collections.singletonList(ResourceRequest.ANY);
|
||||
|
||||
|
|
|
@ -25,8 +25,6 @@ import java.util.LinkedHashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -46,6 +44,8 @@ import org.apache.hadoop.yarn.security.NMTokenIdentifier;
|
|||
import org.apache.hadoop.yarn.util.ConverterUtils;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -53,7 +53,8 @@ import com.google.common.annotations.VisibleForTesting;
|
|||
*/
|
||||
@LimitedPrivate({ "MapReduce", "YARN" })
|
||||
public class ContainerManagementProtocolProxy {
|
||||
static final Log LOG = LogFactory.getLog(ContainerManagementProtocolProxy.class);
|
||||
static final Logger LOG =
|
||||
LoggerFactory.getLogger(ContainerManagementProtocolProxy.class);
|
||||
|
||||
private final int maxConnectedNMs;
|
||||
private final Map<String, ContainerManagementProtocolProxyData> cmProxy;
|
||||
|
|
|
@ -27,8 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -56,6 +54,8 @@ import org.apache.hadoop.yarn.client.api.NMClient;
|
|||
import org.apache.hadoop.yarn.client.api.impl.ContainerManagementProtocolProxy.ContainerManagementProtocolProxyData;
|
||||
import org.apache.hadoop.yarn.exceptions.YarnException;
|
||||
import org.apache.hadoop.yarn.ipc.RPCUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
@ -85,7 +85,8 @@ import org.apache.hadoop.yarn.ipc.RPCUtil;
|
|||
@Unstable
|
||||
public class NMClientImpl extends NMClient {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(NMClientImpl.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(NMClientImpl.class);
|
||||
|
||||
// The logically coherent operations on startedContainers is synchronized to
|
||||
// ensure they are atomic
|
||||
|
|
|
@ -18,8 +18,6 @@
|
|||
|
||||
package org.apache.hadoop.yarn.client.api.impl;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.yarn.api.records.ExecutionType;
|
||||
import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest;
|
||||
import org.apache.hadoop.yarn.api.records.Priority;
|
||||
|
@ -36,10 +34,13 @@ import java.util.TreeMap;
|
|||
import org.apache.hadoop.yarn.api.records.ResourceRequest;
|
||||
import org.apache.hadoop.yarn.client.api.impl.AMRMClientImpl.ResourceRequestInfo;
|
||||
import org.apache.hadoop.yarn.client.api.impl.AMRMClientImpl.ProfileCapabilityComparator;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
class RemoteRequestsTable<T> implements Iterable<ResourceRequestInfo>{
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(RemoteRequestsTable.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(RemoteRequestsTable.class);
|
||||
|
||||
private ProfileCapabilityComparator resourceComparator;
|
||||
|
||||
|
|
|
@ -22,8 +22,6 @@ package org.apache.hadoop.yarn.client.api.impl;
|
|||
import java.io.IOException;
|
||||
import java.net.InetSocketAddress;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -46,6 +44,8 @@ import org.apache.hadoop.yarn.sharedcache.SharedCacheChecksumFactory;
|
|||
import org.apache.hadoop.yarn.util.Records;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* An implementation of the SharedCacheClient API.
|
||||
|
@ -53,8 +53,8 @@ import com.google.common.annotations.VisibleForTesting;
|
|||
@Private
|
||||
@Unstable
|
||||
public class SharedCacheClientImpl extends SharedCacheClient {
|
||||
private static final Log LOG = LogFactory
|
||||
.getLog(SharedCacheClientImpl.class);
|
||||
private static final Logger LOG = LoggerFactory
|
||||
.getLogger(SharedCacheClientImpl.class);
|
||||
|
||||
private ClientSCMProtocol scmClient;
|
||||
private InetSocketAddress scmAddress;
|
||||
|
|
|
@ -29,8 +29,6 @@ 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.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
|
@ -131,12 +129,15 @@ import org.apache.hadoop.yarn.util.resource.ResourceUtils;
|
|||
import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@Private
|
||||
@Unstable
|
||||
public class YarnClientImpl extends YarnClient {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(YarnClientImpl.class);
|
||||
private static final Logger LOG = LoggerFactory
|
||||
.getLogger(YarnClientImpl.class);
|
||||
|
||||
protected ApplicationClientProtocol rmClient;
|
||||
protected long submitPollIntervalMillis;
|
||||
|
|
|
@ -55,8 +55,6 @@ import org.apache.commons.io.IOUtils;
|
|||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.lang.time.DateFormatUtils;
|
||||
import org.apache.commons.lang.time.DurationFormatUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.http.HttpConfig.Policy;
|
||||
import org.apache.hadoop.security.UserGroupInformation;
|
||||
|
@ -78,12 +76,15 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
|
|||
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
|
||||
import org.codehaus.jettison.json.JSONException;
|
||||
import org.codehaus.jettison.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class TopCLI extends YarnCLI {
|
||||
|
||||
private static final String CLUSTER_INFO_URL = "/ws/v1/cluster/info";
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(TopCLI.class);
|
||||
private static final Logger LOG = LoggerFactory
|
||||
.getLogger(TopCLI.class);
|
||||
private String CLEAR = "\u001b[2J";
|
||||
private String CLEAR_LINE = "\u001b[2K";
|
||||
private String SET_CURSOR_HOME = "\u001b[H";
|
||||
|
|
|
@ -23,8 +23,6 @@ import java.io.PrintStream;
|
|||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.service.Service;
|
||||
import org.apache.hadoop.service.Service.STATE;
|
||||
|
@ -37,10 +35,13 @@ import org.junit.AfterClass;
|
|||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class TestGetGroups extends GetGroupsTestBase {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(TestGetGroups.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(TestGetGroups.class);
|
||||
|
||||
private static ResourceManager resourceManager;
|
||||
|
||||
|
|
|
@ -34,8 +34,6 @@ import java.util.concurrent.TimeoutException;
|
|||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.ha.ClientBaseWithFixes;
|
||||
import org.apache.hadoop.ha.HAServiceProtocol;
|
||||
|
@ -64,10 +62,12 @@ import org.junit.Before;
|
|||
import org.junit.Test;
|
||||
|
||||
import com.google.common.base.Supplier;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class TestRMFailover extends ClientBaseWithFixes {
|
||||
private static final Log LOG =
|
||||
LogFactory.getLog(TestRMFailover.class.getName());
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(TestRMFailover.class.getName());
|
||||
private static final HAServiceProtocol.StateChangeRequestInfo req =
|
||||
new HAServiceProtocol.StateChangeRequestInfo(
|
||||
HAServiceProtocol.RequestSource.REQUEST_BY_USER);
|
||||
|
@ -114,7 +114,7 @@ public class TestRMFailover extends ClientBaseWithFixes {
|
|||
client.getApplications();
|
||||
return;
|
||||
} catch (Exception e) {
|
||||
LOG.error(e);
|
||||
LOG.error(e.toString());
|
||||
} finally {
|
||||
client.stop();
|
||||
}
|
||||
|
|
|
@ -22,8 +22,6 @@ import java.net.InetSocketAddress;
|
|||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.service.Service;
|
||||
import org.apache.hadoop.service.Service.STATE;
|
||||
|
@ -53,6 +51,8 @@ import org.junit.AfterClass;
|
|||
import org.junit.Assert;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
|
@ -61,8 +61,8 @@ import static org.junit.Assert.*;
|
|||
*/
|
||||
public class TestResourceManagerAdministrationProtocolPBClientImpl {
|
||||
private static ResourceManager resourceManager;
|
||||
private static final Log LOG = LogFactory
|
||||
.getLog(TestResourceManagerAdministrationProtocolPBClientImpl.class);
|
||||
private static final Logger LOG = LoggerFactory
|
||||
.getLogger(TestResourceManagerAdministrationProtocolPBClientImpl.class);
|
||||
private final RecordFactory recordFactory = RecordFactoryProvider
|
||||
.getRecordFactory(null);
|
||||
|
||||
|
|
|
@ -36,8 +36,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
||||
|
@ -62,11 +60,14 @@ import org.junit.Assert;
|
|||
import org.junit.Test;
|
||||
import org.mockito.invocation.InvocationOnMock;
|
||||
import org.mockito.stubbing.Answer;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
public class TestAMRMClientAsync {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(TestAMRMClientAsync.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(TestAMRMClientAsync.class);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Test(timeout=10000)
|
||||
|
|
|
@ -24,8 +24,6 @@ import java.io.DataOutput;
|
|||
import java.io.IOException;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.io.Text;
|
||||
import org.apache.hadoop.security.UserGroupInformation;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
||||
|
@ -36,10 +34,13 @@ import org.apache.hadoop.yarn.proto.YarnSecurityTestAMRMTokenProtos.AMRMTokenIde
|
|||
import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
|
||||
|
||||
import com.google.protobuf.TextFormat;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class AMRMTokenIdentifierForTest extends AMRMTokenIdentifier {
|
||||
|
||||
private static Log LOG = LogFactory.getLog(AMRMTokenIdentifierForTest.class);
|
||||
private static Logger LOG =
|
||||
LoggerFactory.getLogger(AMRMTokenIdentifierForTest.class);
|
||||
|
||||
public static final Text KIND = new Text("YARN_AM_RM_TOKEN");
|
||||
|
||||
|
|
|
@ -21,8 +21,6 @@ package org.apache.hadoop.yarn.client.api.impl;
|
|||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.net.NetUtils;
|
||||
import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
|
||||
|
@ -47,13 +45,16 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
|
|||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* End-to-End test cases for the AMRMProxy Service.
|
||||
*/
|
||||
public class TestAMRMProxy extends BaseAMRMProxyE2ETest {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(TestAMRMProxy.class);
|
||||
private static final Logger LOG = LoggerFactory
|
||||
.getLogger(TestAMRMProxy.class);
|
||||
|
||||
/*
|
||||
* This test validates register, allocate and finish of an application through
|
||||
|
|
|
@ -34,8 +34,6 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
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.security.Credentials;
|
||||
|
@ -83,6 +81,8 @@ import org.junit.After;
|
|||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class TestNMClient {
|
||||
Configuration conf = null;
|
||||
|
@ -102,8 +102,8 @@ public class TestNMClient {
|
|||
public static class DebugSumContainerStateListener
|
||||
implements ContainerStateTransitionListener {
|
||||
|
||||
private static final Log LOG =
|
||||
LogFactory.getLog(DebugSumContainerStateListener.class);
|
||||
private static final Logger LOG =
|
||||
LoggerFactory.getLogger(DebugSumContainerStateListener.class);
|
||||
private static final Map<ContainerId,
|
||||
Map<org.apache.hadoop.yarn.server.nodemanager.containermanager
|
||||
.container.ContainerState, Long>>
|
||||
|
|
|
@ -28,8 +28,6 @@ import java.io.DataOutputStream;
|
|||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
|
||||
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;
|
||||
|
@ -46,11 +44,13 @@ import org.junit.AfterClass;
|
|||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class TestSharedCacheClientImpl {
|
||||
|
||||
private static final Log LOG = LogFactory
|
||||
.getLog(TestSharedCacheClientImpl.class);
|
||||
private static final Logger LOG = LoggerFactory
|
||||
.getLogger(TestSharedCacheClientImpl.class);
|
||||
|
||||
public static SharedCacheClientImpl client;
|
||||
public static ClientSCMProtocol cProtocol;
|
||||
|
|
|
@ -129,13 +129,11 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.Capacity
|
|||
import org.apache.hadoop.yarn.util.Clock;
|
||||
import org.apache.hadoop.yarn.util.Records;
|
||||
import org.apache.hadoop.yarn.util.UTCClock;
|
||||
import org.apache.log4j.Level;
|
||||
import org.apache.log4j.LogManager;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.slf4j.event.Level;
|
||||
|
||||
public class TestYarnClient {
|
||||
|
||||
|
@ -421,8 +419,7 @@ public class TestYarnClient {
|
|||
|
||||
@Test(timeout = 30000)
|
||||
public void testApplicationType() throws Exception {
|
||||
Logger rootLogger = LogManager.getRootLogger();
|
||||
rootLogger.setLevel(Level.DEBUG);
|
||||
GenericTestUtils.setRootLogLevel(Level.DEBUG);
|
||||
MockRM rm = new MockRM();
|
||||
rm.start();
|
||||
RMApp app = rm.submitApp(2000);
|
||||
|
@ -437,8 +434,7 @@ public class TestYarnClient {
|
|||
|
||||
@Test(timeout = 30000)
|
||||
public void testApplicationTypeLimit() throws Exception {
|
||||
Logger rootLogger = LogManager.getRootLogger();
|
||||
rootLogger.setLevel(Level.DEBUG);
|
||||
GenericTestUtils.setRootLogLevel(Level.DEBUG);
|
||||
MockRM rm = new MockRM();
|
||||
rm.start();
|
||||
RMApp app1 =
|
||||
|
|
Loading…
Reference in New Issue