You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2014/12/03 06:23:54 UTC
[22/50] [abbrv] hadoop git commit: MAPREDUCE-6172. TestDbClasses
timeouts are too aggressive. Contributed by Varun Saxena
MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2b30fb10
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b30fb10
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b30fb10
Branch: refs/heads/HDFS-EC
Commit: 2b30fb1053e70c128b98013fb63cf9a095623be6
Parents: 86e3993
Author: Jason Lowe <jl...@apache.org>
Authored: Mon Dec 1 21:51:05 2014 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon Dec 1 21:51:05 2014 +0000
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b30fb10/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 35efe7f..d932f03 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -255,6 +255,9 @@ Release 2.7.0 - UNRELEASED
correctly in case the number of mappers or reducers is zero. (MinJi Kim via
jianhe)
+ MAPREDUCE-6172. TestDbClasses timeouts are too aggressive (Varun Saxena
+ via jlowe)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b30fb10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java
index 772552c..8169803 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java
@@ -39,7 +39,7 @@ public class TestDbClasses {
* test splitters from DataDrivenDBInputFormat. For different data types may
* be different splitter
*/
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testDataDrivenDBInputFormatSplitter() {
DataDrivenDBInputFormat<NullDBWritable> format = new DataDrivenDBInputFormat<NullDBWritable>();
testCommonSplitterTypes(format);
@@ -49,7 +49,7 @@ public class TestDbClasses {
assertEquals(DateSplitter.class, format.getSplitter(Types.TIME).getClass());
}
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testDataDrivenDBInputFormat() throws Exception {
JobContext jobContext = mock(JobContext.class);
Configuration configuration = new Configuration();
@@ -79,7 +79,7 @@ public class TestDbClasses {
configuration.get(DBConfiguration.INPUT_BOUNDING_QUERY));
}
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testOracleDataDrivenDBInputFormat() throws Exception {
OracleDataDrivenDBInputFormat<NullDBWritable> format =
new OracleDataDrivenDBInputFormatForTest();
@@ -96,7 +96,7 @@ public class TestDbClasses {
* test generate sql script for OracleDBRecordReader.
*/
- @Test(timeout = 2000)
+ @Test(timeout = 20000)
public void testOracleDBRecordReader() throws Exception {
DBInputSplit splitter = new DBInputSplit(1, 10);
Configuration configuration = new Configuration();