commit 94ce2ed2f9386fb0894052e8f0e3001b2a445cc9 Author: stack Date: Wed Oct 14 09:29:20 2015 -0700 HBASE-14606 TestSecureLoadIncrementalHFiles tests timed out in trunk build on apache diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java index 570f812..20c64c4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java @@ -98,7 +98,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads * HFiles that fit snugly inside those regions */ - @Test(timeout = 60000) + @Test(timeout = 120000) public void testSimpleLoad() throws Exception { runTest("testSimpleLoad", BloomType.NONE, new byte[][][] { @@ -111,7 +111,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads * HFiles that cross the boundaries of those regions */ - @Test(timeout = 60000) + @Test(timeout = 120000) public void testRegionCrossingLoad() throws Exception { runTest("testRegionCrossingLoad", BloomType.NONE, new byte[][][] { @@ -135,7 +135,7 @@ public class TestLoadIncrementalHFiles { /** * Test loading into a column family that has a ROWCOL bloom filter. */ - @Test(timeout = 60000) + @Test(timeout = 120000) public void testRegionCrossingRowColBloom() throws Exception { runTest("testRegionCrossingLoadRowColBloom", BloomType.ROWCOL, new byte[][][] { @@ -148,7 +148,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that have * different region boundaries than the table pre-split. */ - @Test(timeout = 60000) + @Test(timeout = 120000) public void testSimpleHFileSplit() throws Exception { runTest("testHFileSplit", BloomType.NONE, new byte[][] { @@ -175,7 +175,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that cross the boundaries * have a ROW bloom filter and a different region boundaries than the table pre-split. */ - @Test(timeout = 60000) + @Test(timeout = 120000) public void testRegionCrossingHFileSplitRowBloom() throws Exception { testRegionCrossingHFileSplit(BloomType.ROW); } @@ -184,7 +184,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that cross the boundaries * have a ROWCOL bloom filter and a different region boundaries than the table pre-split. */ - @Test(timeout = 60000) + @Test(timeout = 120000) public void testRegionCrossingHFileSplitRowColBloom() throws Exception { testRegionCrossingHFileSplit(BloomType.ROWCOL); } @@ -307,12 +307,12 @@ public class TestLoadIncrementalHFiles { } } - @Test(timeout = 60000) + @Test(timeout = 120000) public void testNonHfileFolderWithUnmatchedFamilyName() throws Exception { testNonHfileFolder("testNonHfileFolderWithUnmatchedFamilyName", true); } - @Test(timeout = 60000) + @Test(timeout = 120000) public void testNonHfileFolder() throws Exception { testNonHfileFolder("testNonHfileFolder", false); } @@ -377,7 +377,7 @@ public class TestLoadIncrementalHFiles { } } - @Test(timeout = 60000) + @Test(timeout = 120000) public void testSplitStoreFile() throws IOException { Path dir = util.getDataTestDirOnTestFS("testSplitHFile"); FileSystem fs = util.getTestFileSystem(); @@ -424,7 +424,7 @@ public class TestLoadIncrementalHFiles { map.put(last, value-1); } - @Test(timeout = 60000) + @Test(timeout = 120000) public void testInferBoundaries() { TreeMap map = new TreeMap(Bytes.BYTES_COMPARATOR); @@ -515,7 +515,7 @@ public class TestLoadIncrementalHFiles { loader.run(args); } - @Test(timeout = 60000) + @Test(timeout = 120000) public void testTableWithCFNameStartWithUnderScore() throws Exception { Path dir = util.getDataTestDirOnTestFS("cfNameStartWithUnderScore"); FileSystem fs = util.getTestFileSystem();