From f9ba4ef7d5e50be86ffca71b6c4bbc5575f64326 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Tue, 9 May 2017 16:08:34 -0500 Subject: [PATCH] HADOOP-14377. Increase Common test timeouts from 1 second to 10 seconds. Contributed by Eric Badger (cherry picked from commit f7faac8e90efaed4fbe9975c97e1b861c32cc3a3) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java --- .../crypto/TestCryptoStreamsForLocalFS.java | 10 +-- .../crypto/TestCryptoStreamsNormal.java | 16 ++--- .../fs/TestSymlinkLocalFSFileSystem.java | 8 +-- .../hadoop/io/TestSortedMapWritable.java | 2 +- .../hadoop/io/compress/TestCodecPool.java | 12 ++-- .../security/TestUserGroupInformation.java | 2 +- .../hadoop/service/TestCompositeService.java | 66 +++++++++---------- .../org/apache/hadoop/util/TestClassUtil.java | 2 +- .../apache/hadoop/portmap/TestPortmap.java | 4 +- 9 files changed, 61 insertions(+), 61 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java index 235e9c2dc9f..1ef6f3cdcf9 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java @@ -88,28 +88,28 @@ public class TestCryptoStreamsForLocalFS extends CryptoStreamsTestBase { @Ignore("ChecksumFSInputChecker doesn't support ByteBuffer read") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testByteBufferRead() throws Exception {} @Ignore("ChecksumFSOutputSummer doesn't support Syncable") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testSyncable() throws IOException {} @Ignore("ChecksumFSInputChecker doesn't support ByteBuffer read") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testCombinedOp() throws Exception {} @Ignore("ChecksumFSInputChecker doesn't support enhanced ByteBuffer access") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testHasEnhancedByteBufferAccess() throws Exception { } @Ignore("ChecksumFSInputChecker doesn't support seekToNewSource") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testSeekToNewSource() throws Exception { } } diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java index e9c313fde36..b5382c1efc6 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java @@ -83,41 +83,41 @@ public class TestCryptoStreamsNormal extends CryptoStreamsTestBase { @Ignore("Wrapped stream doesn't support Syncable") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testSyncable() throws IOException {} @Ignore("Wrapped stream doesn't support PositionedRead") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testPositionedRead() throws IOException {} @Ignore("Wrapped stream doesn't support ReadFully") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testReadFully() throws IOException {} @Ignore("Wrapped stream doesn't support Seek") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testSeek() throws IOException {} @Ignore("Wrapped stream doesn't support ByteBufferRead") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testByteBufferRead() throws IOException {} @Ignore("Wrapped stream doesn't support ByteBufferRead, Seek") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testCombinedOp() throws IOException {} @Ignore("Wrapped stream doesn't support SeekToNewSource") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testSeekToNewSource() throws IOException {} @Ignore("Wrapped stream doesn't support HasEnhancedByteBufferAccess") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testHasEnhancedByteBufferAccess() throws IOException {} } diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java index a945ddd22bb..2bb55740743 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java @@ -42,24 +42,24 @@ public class TestSymlinkLocalFSFileSystem extends TestSymlinkLocalFS { @Ignore("RawLocalFileSystem#mkdir does not treat existence of directory" + " as an error") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testMkdirExistingLink() throws IOException {} @Ignore("FileSystem#create defaults to creating parents," + " throwing an IOException instead of FileNotFoundException") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testCreateFileViaDanglingLinkParent() throws IOException {} @Ignore("RawLocalFileSystem does not throw an exception if the path" + " already exists") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testCreateFileDirExistingLink() throws IOException {} @Ignore("ChecksumFileSystem does not support append") @Override - @Test(timeout=1000) + @Test(timeout=10000) public void testAccessFileViaInterSymlinkAbsTarget() throws IOException {} @Override diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java index 5ed1db25ffb..023d46e027f 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java @@ -165,7 +165,7 @@ public class TestSortedMapWritable { assertTrue(failureReason, !mapB.equals(mapA)); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testPutAll() { SortedMapWritable map1 = new SortedMapWritable(); SortedMapWritable map2 = new SortedMapWritable(); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java index c889a59b262..1fb25cb9087 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java @@ -43,7 +43,7 @@ public class TestCodecPool { this.codec.setConf(new Configuration()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testCompressorPoolCounts() { // Get two compressors and return them Compressor comp1 = CodecPool.getCompressor(codec); @@ -64,7 +64,7 @@ public class TestCodecPool { CodecPool.getLeasedCompressorsCount(codec)); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testCompressorNotReturnSameInstance() { Compressor comp = CodecPool.getCompressor(codec); CodecPool.returnCompressor(comp); @@ -79,7 +79,7 @@ public class TestCodecPool { } } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testDecompressorPoolCounts() { // Get two decompressors and return them Decompressor decomp1 = CodecPool.getDecompressor(codec); @@ -100,7 +100,7 @@ public class TestCodecPool { CodecPool.getLeasedCompressorsCount(codec)); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testMultiThreadedCompressorPool() throws InterruptedException { final int iterations = 4; ExecutorService threadpool = Executors.newFixedThreadPool(3); @@ -137,7 +137,7 @@ public class TestCodecPool { assertEquals(LEASE_COUNT_ERR, 0, CodecPool.getLeasedCompressorsCount(codec)); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testMultiThreadedDecompressorPool() throws InterruptedException { final int iterations = 4; ExecutorService threadpool = Executors.newFixedThreadPool(3); @@ -175,7 +175,7 @@ public class TestCodecPool { CodecPool.getLeasedDecompressorsCount(codec)); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testDecompressorNotReturnSameInstance() { Decompressor decomp = CodecPool.getDecompressor(codec); CodecPool.returnDecompressor(decomp); 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 fff0ae8664a..e729593ceea 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 @@ -824,7 +824,7 @@ public class TestUserGroupInformation { assertEquals("guest@DEFAULT.REALM", ugi.getUserName()); } - @Test(timeout=1000) + @Test(timeout=10000) public void testSetLoginUser() throws IOException { UserGroupInformation ugi = UserGroupInformation.createRemoteUser("test-user"); UserGroupInformation.setLoginUser(ugi); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java index 9493740ad6b..6189c0ed19f 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java @@ -312,7 +312,7 @@ public class TestCompositeService { assertInState(STATE.INITED, child); } - @Test (timeout = 1000) + @Test (timeout = 10000) public void testAddIfService() { CompositeService testService = new CompositeService("TestService") { Service service; @@ -363,7 +363,7 @@ public class TestCompositeService { // Tests for adding child service to parent // - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedChildBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -376,7 +376,7 @@ public class TestCompositeService { assertInState(STATE.STOPPED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedChildInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -396,7 +396,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedChildInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -408,7 +408,7 @@ public class TestCompositeService { assertInState(STATE.NOTINITED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedChildInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -419,7 +419,7 @@ public class TestCompositeService { assertInState(STATE.NOTINITED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedChildBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -433,7 +433,7 @@ public class TestCompositeService { assertInState(STATE.STOPPED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedChildInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -446,7 +446,7 @@ public class TestCompositeService { assertInState(STATE.STOPPED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedChildInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -459,7 +459,7 @@ public class TestCompositeService { assertInState(STATE.STOPPED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedChildInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -471,7 +471,7 @@ public class TestCompositeService { assertInState(STATE.INITED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedChildBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -489,7 +489,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedChildInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -503,7 +503,7 @@ public class TestCompositeService { assertInState(STATE.STOPPED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedChildInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -517,7 +517,7 @@ public class TestCompositeService { assertInState(STATE.STOPPED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedChildInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -530,7 +530,7 @@ public class TestCompositeService { assertInState(STATE.STARTED, child); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedChildBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -549,7 +549,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedChildInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -570,7 +570,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedChildInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -583,7 +583,7 @@ public class TestCompositeService { parent.stop(); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedChildInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService child = new BreakableService(); @@ -600,7 +600,7 @@ public class TestCompositeService { // Tests for adding sibling service to parent // - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedSiblingBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -617,7 +617,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedSiblingInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -636,7 +636,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedSiblingInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -653,7 +653,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddUninitedSiblingInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -670,7 +670,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedSiblingBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -688,7 +688,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedSiblingInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -706,7 +706,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedSiblingInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -724,7 +724,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddInitedSiblingInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -735,7 +735,7 @@ public class TestCompositeService { parent.init(new Configuration()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedSiblingBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -754,7 +754,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedSiblingInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -774,7 +774,7 @@ public class TestCompositeService { } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedSiblingInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -793,7 +793,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStartedSiblingInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -812,7 +812,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedSiblingBeforeInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -832,7 +832,7 @@ public class TestCompositeService { 1, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedSiblingInInit() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -856,7 +856,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedSiblingInStart() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); @@ -876,7 +876,7 @@ public class TestCompositeService { 2, parent.getServices().size()); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testAddStoppedSiblingInStop() throws Throwable { CompositeService parent = new CompositeService("parent"); BreakableService sibling = new BreakableService(); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java index 4bc36e2ec0a..98e182236c9 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java @@ -26,7 +26,7 @@ import org.apache.log4j.Logger; import org.junit.Test; public class TestClassUtil { - @Test(timeout=1000) + @Test(timeout=10000) public void testFindContainingJar() { String containingJar = ClassUtil.findContainingJar(Logger.class); Assert.assertNotNull("Containing jar not found for Logger", diff --git a/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java b/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java index f217e843d7c..ba132bb7abe 100644 --- a/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java +++ b/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java @@ -53,7 +53,7 @@ public class TestPortmap { pm.shutdown(); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testIdle() throws InterruptedException, IOException { Socket s = new Socket(); try { @@ -75,7 +75,7 @@ public class TestPortmap { } } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testRegistration() throws IOException, InterruptedException { XDR req = new XDR(); RpcCall.getInstance(++xid, RpcProgramPortmap.PROGRAM,