Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena 

(cherry picked from commit 2b30fb1053)
This commit is contained in:
Jason Lowe 2014-12-01 21:51:05 +00:00
parent f6d1bf5ed1
commit 2bdef5697b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -28,6 +28,9 @@ Release 2.7.0 - UNRELEASED
correctly in case the number of mappers or reducers is zero. (MinJi Kim via correctly in case the number of mappers or reducers is zero. (MinJi Kim via
jianhe) jianhe)
MAPREDUCE-6172. TestDbClasses timeouts are too aggressive (Varun Saxena
via jlowe)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java
View File

@ -39,7 +39,7 @@ public class TestDbClasses {
* test splitters from DataDrivenDBInputFormat. For different data types may * test splitters from DataDrivenDBInputFormat. For different data types may
* be different splitter * be different splitter
*/ */
@Test(timeout = 1000) @Test(timeout = 10000)
public void testDataDrivenDBInputFormatSplitter() { public void testDataDrivenDBInputFormatSplitter() {
DataDrivenDBInputFormat<NullDBWritable> format = new DataDrivenDBInputFormat<NullDBWritable>(); DataDrivenDBInputFormat<NullDBWritable> format = new DataDrivenDBInputFormat<NullDBWritable>();
testCommonSplitterTypes(format); testCommonSplitterTypes(format);
@ -49,7 +49,7 @@ public void testDataDrivenDBInputFormatSplitter() {
assertEquals(DateSplitter.class, format.getSplitter(Types.TIME).getClass()); assertEquals(DateSplitter.class, format.getSplitter(Types.TIME).getClass());
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testDataDrivenDBInputFormat() throws Exception { public void testDataDrivenDBInputFormat() throws Exception {
JobContext jobContext = mock(JobContext.class); JobContext jobContext = mock(JobContext.class);
Configuration configuration = new Configuration(); Configuration configuration = new Configuration();
@ -79,7 +79,7 @@ public void testDataDrivenDBInputFormat() throws Exception {
configuration.get(DBConfiguration.INPUT_BOUNDING_QUERY)); configuration.get(DBConfiguration.INPUT_BOUNDING_QUERY));
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testOracleDataDrivenDBInputFormat() throws Exception { public void testOracleDataDrivenDBInputFormat() throws Exception {
OracleDataDrivenDBInputFormat<NullDBWritable> format = OracleDataDrivenDBInputFormat<NullDBWritable> format =
new OracleDataDrivenDBInputFormatForTest(); new OracleDataDrivenDBInputFormatForTest();
@ -96,7 +96,7 @@ public void testOracleDataDrivenDBInputFormat() throws Exception {
* test generate sql script for OracleDBRecordReader. * test generate sql script for OracleDBRecordReader.
*/ */
@Test(timeout = 2000) @Test(timeout = 20000)
public void testOracleDBRecordReader() throws Exception { public void testOracleDBRecordReader() throws Exception {
DBInputSplit splitter = new DBInputSplit(1, 10); DBInputSplit splitter = new DBInputSplit(1, 10);
Configuration configuration = new Configuration(); Configuration configuration = new Configuration();