From 8fc5dcc2a199c6b202e55c4cfdf5ae4eb09ef003 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Sat, 8 Jul 2017 02:53:18 +0900 Subject: [PATCH] Revert "HADOOP-14587. Use GenericTestUtils.setLogLevel when available in hadoop-common. Contributed by Wenxin He." This reverts commit 82cb2a6497caa7c5e693aa41ad18e92f1c7eb16a. --- .../fs/FileContextCreateMkdirBaseTest.java | 2 +- .../hadoop/fs/FileContextPermissionBase.java | 5 ++-- .../apache/hadoop/fs/FileContextUtilBase.java | 5 ++-- .../org/apache/hadoop/fs/TestListFiles.java | 4 +-- .../fs/TestLocalFileSystemPermission.java | 2 +- .../ha/TestActiveStandbyElectorRealZK.java | 7 +++-- .../hadoop/ha/TestSshFenceByTcpPort.java | 6 ++-- .../hadoop/ha/TestZKFailoverController.java | 5 ++-- .../serializer/TestSerializationFactory.java | 6 ++-- .../apache/hadoop/ipc/MiniRPCBenchmark.java | 13 ++++---- .../java/org/apache/hadoop/ipc/TestIPC.java | 5 ++-- .../hadoop/ipc/TestMiniRPCBenchmark.java | 2 +- .../java/org/apache/hadoop/ipc/TestRPC.java | 2 +- .../org/apache/hadoop/ipc/TestSaslRPC.java | 16 +++++----- .../hadoop/security/TestGroupFallback.java | 12 ++++---- .../hadoop/security/TestUGIWithMiniKdc.java | 2 +- .../security/TestUserGroupInformation.java | 2 +- .../hadoop/security/ssl/TestSSLFactory.java | 2 +- .../web/TestWebDelegationToken.java | 2 +- .../apache/hadoop/test/GenericTestUtils.java | 30 ------------------- .../hadoop/test/TestGenericTestUtils.java | 10 ------- .../hadoop/util/Crc32PerformanceTest.java | 11 ++++--- hadoop-common-project/hadoop-nfs/pom.xml | 6 ---- .../hadoop/oncrpc/TestFrameDecoder.java | 6 ++-- ...TestDFSStripedOutputStreamWithFailure.java | 28 ----------------- 25 files changed, 59 insertions(+), 132 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java index fbd598c9de..c1de27a347 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java @@ -20,6 +20,7 @@ import java.io.IOException; +import org.apache.log4j.Level; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -29,7 +30,6 @@ import static org.apache.hadoop.fs.contract.ContractTestUtils.assertIsFile; import org.apache.hadoop.test.GenericTestUtils; -import org.slf4j.event.Level; /** *

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java index 240989eea5..dff89f9669 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.StringTokenizer; -import org.apache.hadoop.test.GenericTestUtils; import org.junit.Assert; import org.apache.hadoop.fs.permission.FsPermission; @@ -33,7 +32,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.slf4j.event.Level; import static org.apache.hadoop.fs.FileContextTestHelper.*; import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows; @@ -63,7 +61,8 @@ public abstract class FileContextPermissionBase { { try { - GenericTestUtils.setLogLevel(FileSystem.LOG, Level.DEBUG); + ((org.apache.commons.logging.impl.Log4JLogger)FileSystem.LOG).getLogger() + .setLevel(org.apache.log4j.Level.DEBUG); } catch(Exception e) { System.out.println("Cannot change log level\n" diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextUtilBase.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextUtilBase.java index 0a96d3e45e..bebf4bfc48 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextUtilBase.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextUtilBase.java @@ -23,12 +23,10 @@ import java.util.Arrays; -import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.StringUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.slf4j.event.Level; /** *

@@ -50,7 +48,8 @@ public abstract class FileContextUtilBase { { try { - GenericTestUtils.setLogLevel(FileSystem.LOG, Level.DEBUG); + ((org.apache.commons.logging.impl.Log4JLogger)FileSystem.LOG).getLogger() + .setLevel(org.apache.log4j.Level.DEBUG); } catch(Exception e) { System.out.println("Cannot change log level\n" + StringUtils.stringifyException(e)); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestListFiles.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestListFiles.java index 44308ea6fc..010754fe50 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestListFiles.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestListFiles.java @@ -24,18 +24,18 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.test.GenericTestUtils; +import org.apache.log4j.Level; import static org.junit.Assert.*; import org.junit.Test; import org.junit.BeforeClass; -import org.slf4j.event.Level; /** * This class tests the FileStatus API. */ public class TestListFiles { static { - GenericTestUtils.setLogLevel(FileSystem.LOG, Level.TRACE); + GenericTestUtils.setLogLevel(FileSystem.LOG, Level.ALL); } static final long seed = 0xDEADBEEFL; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystemPermission.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystemPermission.java index 81756f9305..1478111a39 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystemPermission.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystemPermission.java @@ -21,10 +21,10 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.Shell; +import org.apache.log4j.Level; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.event.Level; import java.io.IOException; import java.util.ArrayList; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java index bbef9ef65b..59c0886827 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java @@ -24,11 +24,12 @@ import java.util.Collections; import java.util.UUID; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.ha.ActiveStandbyElector.ActiveStandbyElectorCallback; import org.apache.hadoop.ha.ActiveStandbyElector.State; -import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.ZKUtil.ZKAuthInfo; +import org.apache.log4j.Level; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.ZooKeeper; @@ -38,7 +39,6 @@ import org.mockito.Mockito; import com.google.common.primitives.Ints; -import org.slf4j.event.Level; /** * Test for {@link ActiveStandbyElector} using real zookeeper. @@ -47,7 +47,8 @@ public class TestActiveStandbyElectorRealZK extends ClientBaseWithFixes { static final int NUM_ELECTORS = 2; static { - GenericTestUtils.setLogLevel(ActiveStandbyElector.LOG, Level.TRACE); + ((Log4JLogger)ActiveStandbyElector.LOG).getLogger().setLevel( + Level.ALL); } static final String PARENT_DIR = "/" + UUID.randomUUID(); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestSshFenceByTcpPort.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestSshFenceByTcpPort.java index f0ebc1ec84..51fb8291b7 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestSshFenceByTcpPort.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestSshFenceByTcpPort.java @@ -21,18 +21,18 @@ import java.net.InetSocketAddress; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; import org.apache.hadoop.ha.SshFenceByTcpPort.Args; -import org.apache.hadoop.test.GenericTestUtils; +import org.apache.log4j.Level; import org.junit.Assume; import org.junit.Test; -import org.slf4j.event.Level; public class TestSshFenceByTcpPort { static { - GenericTestUtils.setLogLevel(SshFenceByTcpPort.LOG, Level.TRACE); + ((Log4JLogger)SshFenceByTcpPort.LOG).getLogger().setLevel(Level.ALL); } private static String TEST_FENCING_HOST = System.getProperty( diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java index 0fa8e862ad..846c8aeb11 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java @@ -22,6 +22,7 @@ import java.security.NoSuchAlgorithmException; import com.google.common.base.Supplier; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; import org.apache.hadoop.ha.HAServiceProtocol.StateChangeRequestInfo; @@ -29,6 +30,7 @@ import org.apache.hadoop.ha.MiniZKFCCluster.DummyZKFC; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.Time; +import org.apache.log4j.Level; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.Stat; @@ -39,7 +41,6 @@ import org.junit.Test; import org.junit.rules.Timeout; import org.mockito.Mockito; -import org.slf4j.event.Level; public class TestZKFailoverController extends ClientBaseWithFixes { private Configuration conf; @@ -70,7 +71,7 @@ public class TestZKFailoverController extends ClientBaseWithFixes { "digest:" + DIGEST_USER_HASH + ":rwcda"; static { - GenericTestUtils.setLogLevel(ActiveStandbyElector.LOG, Level.TRACE); + ((Log4JLogger)ActiveStandbyElector.LOG).getLogger().setLevel(Level.ALL); } @Before diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestSerializationFactory.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestSerializationFactory.java index 2cde3e3ecc..6774155758 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestSerializationFactory.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestSerializationFactory.java @@ -18,21 +18,21 @@ package org.apache.hadoop.io.serializer; import org.apache.hadoop.io.LongWritable; -import org.apache.hadoop.test.GenericTestUtils; import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.io.Writable; -import org.slf4j.event.Level; +import org.apache.log4j.Level; public class TestSerializationFactory { static { - GenericTestUtils.setLogLevel(SerializationFactory.LOG, Level.TRACE); + ((Log4JLogger) SerializationFactory.LOG).getLogger().setLevel(Level.ALL); } static Configuration conf; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java index 2290270bfb..cdbd5570f1 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java @@ -26,9 +26,9 @@ import java.util.Arrays; import java.util.Enumeration; -import org.apache.hadoop.test.GenericTestUtils; import org.junit.Assert; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.apache.hadoop.net.NetUtils; @@ -43,7 +43,8 @@ import org.apache.hadoop.security.token.delegation.TestDelegationToken.TestDelegationTokenIdentifier; import org.apache.hadoop.security.token.delegation.TestDelegationToken.TestDelegationTokenSecretManager; import org.apache.hadoop.util.Time; -import org.slf4j.event.Level; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; /** * MiniRPCBenchmark measures time to establish an RPC connection @@ -254,9 +255,9 @@ public MiniProtocol run() throws IOException { } static void setLoggingLevel(Level level) { - GenericTestUtils.setLogLevel(Server.LOG, level); - GenericTestUtils.setLogLevel(Server.AUDITLOG, level); - GenericTestUtils.setLogLevel(Client.LOG, level); + LogManager.getLogger(Server.class.getName()).setLevel(level); + ((Log4JLogger)Server.AUDITLOG).getLogger().setLevel(level); + LogManager.getLogger(Client.class.getName()).setLevel(level); } /** @@ -369,7 +370,7 @@ public static void main(String[] args) throws Exception { useDelegationToken = args[3].equalsIgnoreCase("useToken"); Level l = Level.ERROR; if(args.length > 4) - l = GenericTestUtils.toLevel(args[4]); + l = Level.toLevel(args[4]); MiniRPCBenchmark mb = new MiniRPCBenchmark(l); long elapsedTime = 0; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java index 4bda6377c5..1d47473533 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java @@ -60,6 +60,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; @@ -84,6 +85,7 @@ import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.StringUtils; +import org.apache.log4j.Level; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; @@ -96,7 +98,6 @@ import com.google.common.base.Supplier; import com.google.common.primitives.Bytes; import com.google.common.primitives.Ints; -import org.slf4j.event.Level; /** Unit tests for IPC. */ public class TestIPC { @@ -863,7 +864,7 @@ public void run() { @Test(timeout=30000) public void testConnectionIdleTimeouts() throws Exception { - GenericTestUtils.setLogLevel(Server.LOG, Level.DEBUG); + ((Log4JLogger)Server.LOG).getLogger().setLevel(Level.DEBUG); final int maxIdle = 1000; final int cleanupInterval = maxIdle*3/4; // stagger cleanups final int killMax = 3; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java index a130fa9757..0f34be8f57 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java @@ -18,8 +18,8 @@ package org.apache.hadoop.ipc; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Level; import org.junit.Test; -import org.slf4j.event.Level; /** * Test {@link MiniRPCBenchmark} diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java index 8725cf426a..166b205714 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java @@ -50,11 +50,11 @@ import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.MetricsAsserts; import org.apache.hadoop.test.MockitoUtil; +import org.apache.log4j.Level; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.mockito.internal.util.reflection.Whitebox; -import org.slf4j.event.Level; import javax.net.SocketFactory; import java.io.Closeable; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java index 7608cb439a..c48ff2e186 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; @@ -35,7 +36,7 @@ import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod; import org.apache.hadoop.security.token.*; import org.apache.hadoop.security.token.SecretManager.InvalidToken; -import org.apache.hadoop.test.GenericTestUtils; +import org.apache.log4j.Level; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -43,7 +44,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.slf4j.event.Level; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -186,12 +186,12 @@ static String getQOPNames (QualityOfProtection[] qops){ } static { - GenericTestUtils.setLogLevel(Client.LOG, Level.TRACE); - GenericTestUtils.setLogLevel(Server.LOG, Level.TRACE); - GenericTestUtils.setLogLevel(SaslRpcClient.LOG, Level.TRACE); - GenericTestUtils.setLogLevel(SaslRpcServer.LOG, Level.TRACE); - GenericTestUtils.setLogLevel(SaslInputStream.LOG, Level.TRACE); - GenericTestUtils.setLogLevel(SecurityUtil.LOG, Level.TRACE); + ((Log4JLogger) Client.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger) Server.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger) SaslRpcClient.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger) SaslRpcServer.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger) SaslInputStream.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger) SecurityUtil.LOG).getLogger().setLevel(Level.ALL); } public static class BadTokenSecretManager extends TestTokenSecretManager { diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupFallback.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupFallback.java index 85f17b1639..a61eee6409 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupFallback.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupFallback.java @@ -25,16 +25,16 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; -import org.apache.hadoop.test.GenericTestUtils; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; import org.junit.Test; -import org.slf4j.event.Level; public class TestGroupFallback { public static final Log LOG = LogFactory.getLog(TestGroupFallback.class); @Test public void testGroupShell() throws Exception { - GenericTestUtils.setRootLogLevel(Level.DEBUG); + Logger.getRootLogger().setLevel(Level.DEBUG); Configuration conf = new Configuration(); conf.set(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING, "org.apache.hadoop.security.ShellBasedUnixGroupsMapping"); @@ -50,7 +50,7 @@ public void testGroupShell() throws Exception { @Test public void testNetgroupShell() throws Exception { - GenericTestUtils.setRootLogLevel(Level.DEBUG); + Logger.getRootLogger().setLevel(Level.DEBUG); Configuration conf = new Configuration(); conf.set(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING, "org.apache.hadoop.security.ShellBasedUnixGroupsNetgroupMapping"); @@ -69,7 +69,7 @@ public void testGroupWithFallback() throws Exception { LOG.info("running 'mvn -Pnative -DTestGroupFallback clear test' will " + "test the normal path and 'mvn -DTestGroupFallback clear test' will" + " test the fall back functionality"); - GenericTestUtils.setRootLogLevel(Level.DEBUG); + Logger.getRootLogger().setLevel(Level.DEBUG); Configuration conf = new Configuration(); conf.set(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING, "org.apache.hadoop.security.JniBasedUnixGroupsMappingWithFallback"); @@ -88,7 +88,7 @@ public void testNetgroupWithFallback() throws Exception { LOG.info("running 'mvn -Pnative -DTestGroupFallback clear test' will " + "test the normal path and 'mvn -DTestGroupFallback clear test' will" + " test the fall back functionality"); - GenericTestUtils.setRootLogLevel(Level.DEBUG); + Logger.getRootLogger().setLevel(Level.DEBUG); Configuration conf = new Configuration(); conf.set(CommonConfigurationKeys.HADOOP_SECURITY_GROUP_MAPPING, "org.apache.hadoop.security.JniBasedUnixGroupsNetgroupMappingWithFallback"); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithMiniKdc.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithMiniKdc.java index 6c94b1da64..2c6c7e4b9c 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithMiniKdc.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithMiniKdc.java @@ -23,9 +23,9 @@ import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.LambdaTestUtils; import org.apache.hadoop.util.PlatformName; +import org.apache.log4j.Level; import org.junit.After; import org.junit.Test; -import org.slf4j.event.Level; import javax.security.auth.Subject; import javax.security.auth.kerberos.KerberosPrincipal; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java index bcb2126c06..00062c0a37 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java @@ -33,6 +33,7 @@ import org.apache.hadoop.util.Shell; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Time; +import org.apache.log4j.Level; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -40,7 +41,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.event.Level; import javax.security.auth.Subject; import javax.security.auth.kerberos.KerberosPrincipal; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestSSLFactory.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestSSLFactory.java index 4f1aca068d..5369c9d8d5 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestSSLFactory.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestSSLFactory.java @@ -26,6 +26,7 @@ import org.apache.hadoop.security.alias.JavaKeyStoreProvider; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.StringUtils; +import org.apache.log4j.Level; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -33,7 +34,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.event.Level; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLEngine; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/TestWebDelegationToken.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/TestWebDelegationToken.java index c564b975f5..7319e4ca2b 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/TestWebDelegationToken.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/TestWebDelegationToken.java @@ -32,6 +32,7 @@ import org.apache.hadoop.security.authentication.util.KerberosUtil; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager; import org.apache.hadoop.test.GenericTestUtils; +import org.apache.log4j.Level; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; @@ -41,7 +42,6 @@ import org.junit.Test; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; -import org.slf4j.event.Level; import javax.security.auth.Subject; import javax.security.auth.kerberos.KerberosPrincipal; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java index 82a5e08b03..77a79ff140 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java @@ -140,20 +140,6 @@ public static void setLogLevel(Log log, Level level) { setLogLevel((Log4JLogger) log, level); } - /** - * A helper used in log4j2 migration to accept legacy - * org.apache.commons.logging apis. - *

- * And will be removed after migration. - * - * @param log a log - * @param level level to be set - */ - @Deprecated - public static void setLogLevel(Log log, org.slf4j.event.Level level) { - setLogLevel(log, Level.toLevel(level.toString())); - } - /** * @deprecated * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead @@ -186,22 +172,6 @@ public static void setLogLevel(org.slf4j.Logger logger, setLogLevel(toLog4j(logger), Level.toLevel(level.toString())); } - public static void setRootLogLevel(org.slf4j.event.Level level) { - setLogLevel(LogManager.getRootLogger(), Level.toLevel(level.toString())); - } - - public static org.slf4j.event.Level toLevel(String level) { - return toLevel(level, org.slf4j.event.Level.DEBUG); - } - - public static org.slf4j.event.Level toLevel( - String level, org.slf4j.event.Level defaultLevel) { - try { - return org.slf4j.event.Level.valueOf(level); - } catch (IllegalArgumentException e) { - return defaultLevel; - } - } /** * Extracts the name of the method where the invocation has happened * @return String name of the invoking method diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestGenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestGenericTestUtils.java index c1d45ccd29..b3fc836d5f 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestGenericTestUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestGenericTestUtils.java @@ -27,9 +27,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Supplier; -import org.slf4j.event.Level; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -153,12 +151,4 @@ public Boolean get() { assertExceptionContains(GenericTestUtils.ERROR_INVALID_ARGUMENT, e); } } - - @Test - public void testToLevel() throws Throwable { - assertEquals(Level.INFO, toLevel("INFO")); - assertEquals(Level.DEBUG, toLevel("NonExistLevel")); - assertEquals(Level.INFO, toLevel("INFO", Level.TRACE)); - assertEquals(Level.TRACE, toLevel("NonExistLevel", Level.TRACE)); - } } diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/Crc32PerformanceTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/Crc32PerformanceTest.java index ce28f503a8..34dfc3a6db 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/Crc32PerformanceTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/Crc32PerformanceTest.java @@ -27,11 +27,10 @@ import java.util.zip.CRC32; import java.util.zip.Checksum; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.fs.ChecksumException; -import org.apache.hadoop.test.GenericTestUtils; -import org.slf4j.event.Level; - -import static org.slf4j.LoggerFactory.getLogger; +import org.apache.log4j.Level; /** * Performance tests to compare performance of Crc32|Crc32C implementations @@ -177,8 +176,8 @@ public DataChecksum.Type crcType() { crcs.add(Crc32.Native.class); } crcs.add(Crc32.NativeC.class); - GenericTestUtils.setLogLevel(getLogger(NativeCodeLoader.class), - Level.TRACE); + ((Log4JLogger)LogFactory.getLog(NativeCodeLoader.class)) + .getLogger().setLevel(Level.ALL); } } diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index bd5ab924f8..5fdaf44aba 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -47,12 +47,6 @@ hadoop-common provided - - org.apache.hadoop - hadoop-common - test - test-jar - junit junit diff --git a/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java b/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java index 0e416b3738..9d0fe0fdd7 100644 --- a/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java +++ b/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java @@ -28,7 +28,8 @@ import org.apache.hadoop.oncrpc.RpcUtil.RpcFrameDecoder; import org.apache.hadoop.oncrpc.security.CredentialsNone; import org.apache.hadoop.oncrpc.security.VerifierNone; -import org.apache.hadoop.test.GenericTestUtils; +import org.apache.log4j.Level; +import org.apache.commons.logging.impl.Log4JLogger; import org.jboss.netty.buffer.ByteBufferBackedChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; @@ -37,12 +38,11 @@ import org.jboss.netty.channel.ChannelHandlerContext; import org.junit.Test; import org.mockito.Mockito; -import org.slf4j.event.Level; public class TestFrameDecoder { static { - GenericTestUtils.setLogLevel(RpcProgram.LOG, Level.TRACE); + ((Log4JLogger) RpcProgram.LOG).getLogger().setLevel(Level.ALL); } private static int resultSize; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java index 5b99d45571..9915a2fb6d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java @@ -390,34 +390,6 @@ void runTestWithMultipleFailure(final int length) throws Exception { } } - /** - * When all the two DataNodes with partial data block fail - */ - @Test - public void runTestWithMultipleFailure2() throws Exception { - final HdfsConfiguration conf = newHdfsConfiguration(); - // two DNs have cellSize and the other DNs have cellSize*2 - final int length = cellSize * (dataBlocks * 2 - 2); - // select the two DNs with partial block to kill - final int[] dnIndex = {dataBlocks - 2, dataBlocks - 1}; - final int[] killPos = getKillPositions(length, dnIndex.length); - - try { - LOG.info("runTestWithMultipleFailure2: length==" + length + ", killPos=" - + Arrays.toString(killPos) + ", dnIndex=" - + Arrays.toString(dnIndex)); - setup(conf); - runTest(length, killPos, dnIndex, false); - } catch (Throwable e) { - final String err = "failed, killPos=" + Arrays.toString(killPos) - + ", dnIndex=" + Arrays.toString(dnIndex) + ", length=" + length; - LOG.error(err); - throw e; - } finally { - tearDown(); - } - } - /** * runTest implementation. * @param length file length