Repository: hbase Updated Branches: refs/heads/branch-1 319a9d3ff -> 74c4dbdf3
HBASE-12152 TestLoadIncrementalHFiles shows up as zombie test; ADD TIMEOUT ON TESTS -- Up timeout from 120 to 120000 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/74c4dbdf Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/74c4dbdf Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/74c4dbdf Branch: refs/heads/branch-1 Commit: 74c4dbdf39fa11aa0537b8c4b17785452c2dae21 Parents: 319a9d3 Author: stack <st...@apache.org> Authored: Thu Oct 2 13:18:08 2014 -0700 Committer: stack <st...@apache.org> Committed: Thu Oct 2 13:18:51 2014 -0700 ---------------------------------------------------------------------- .../TestLoadIncrementalHFilesSplitRecovery.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/74c4dbdf/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java index b6af85b..12f7e6f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java @@ -228,7 +228,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { /** * Checks that all columns have the expected value and that there is the * expected number of rows. - * @throws IOException + * @throws IOException */ void assertExpectedTable(TableName table, int count, int value) throws IOException { Table t = null; @@ -259,7 +259,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * Test that shows that exception thrown from the RS side will result in an * exception on the LIHFile client. */ - @Test(expected=IOException.class, timeout=120) + @Test(expected=IOException.class, timeout=120000) public void testBulkLoadPhaseFailure() throws Exception { TableName table = TableName.valueOf("bulkLoadPhaseFailure"); setupTable(table, 10); @@ -331,7 +331,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * to test this path, so we actually inject a split just before the atomic * region load. */ - @Test (timeout=120) + @Test (timeout=120000) public void testSplitWhileBulkLoadPhase() throws Exception { final TableName table = TableName.valueOf("splitWhileBulkloadPhase"); setupTable(table, 10); @@ -373,7 +373,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * This test splits a table and attempts to bulk load. The bulk import files * should be split before atomically importing. */ - @Test (timeout=120) + @Test (timeout=120000) public void testGroupOrSplitPresplit() throws Exception { final TableName table = TableName.valueOf("groupOrSplitPresplit"); setupTable(table, 10); @@ -409,7 +409,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * This simulates an remote exception which should cause LIHF to exit with an * exception. */ - @Test(expected = IOException.class, timeout=120) + @Test(expected = IOException.class, timeout=120000) public void testGroupOrSplitFailure() throws Exception { TableName table = TableName.valueOf("groupOrSplitFailure"); setupTable(table, 10); @@ -439,7 +439,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { fail("doBulkLoad should have thrown an exception"); } - @Test (timeout=120) + @Test (timeout=120000) public void testGroupOrSplitWhenRegionHoleExistsInMeta() throws Exception { TableName tableName = TableName.valueOf("testGroupOrSplitWhenRegionHoleExistsInMeta"); byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000100") }; @@ -451,7 +451,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { final AtomicInteger countedLqis = new AtomicInteger(); LoadIncrementalHFiles loader = new LoadIncrementalHFiles( util.getConfiguration()) { - + protected List<LoadQueueItem> groupOrSplit( Multimap<ByteBuffer, LoadQueueItem> regionGroups, final LoadQueueItem item, final HTable htable,
