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

MAPREDUCE-5834. Increased test-timeouts in TestGridMixClasses to avoid occassional failures. Contributed by Mit Desai. 

svn merge --ignore-ancestry -c 1601764 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601765 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2014-06-10 20:25:22 +00:00
parent dc5ee5ff7c
commit 71028526c1
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,9 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5886. Allow wordcount example job to accept multiple input paths. MAPREDUCE-5886. Allow wordcount example job to accept multiple input paths.
(cnauroth) (cnauroth)
MAPREDUCE-5834. Increased test-timeouts in TestGridMixClasses to avoid
occassional failures. (Mit Desai via vinodkv)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

18
hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
View File

@ -376,7 +376,7 @@ public class TestGridMixClasses {
/* /*
* test LoadSortComparator * test LoadSortComparator
*/ */
@Test (timeout=1000) @Test (timeout=3000)
public void testLoadJobLoadSortComparator() throws Exception { public void testLoadJobLoadSortComparator() throws Exception {
LoadJob.LoadSortComparator test = new LoadJob.LoadSortComparator(); LoadJob.LoadSortComparator test = new LoadJob.LoadSortComparator();
@ -409,7 +409,7 @@ public class TestGridMixClasses {
/* /*
* test SpecGroupingComparator * test SpecGroupingComparator
*/ */
@Test (timeout=1000) @Test (timeout=3000)
public void testGridmixJobSpecGroupingComparator() throws Exception { public void testGridmixJobSpecGroupingComparator() throws Exception {
GridmixJob.SpecGroupingComparator test = new GridmixJob.SpecGroupingComparator(); GridmixJob.SpecGroupingComparator test = new GridmixJob.SpecGroupingComparator();
@ -452,7 +452,7 @@ public class TestGridMixClasses {
/* /*
* test CompareGridmixJob only equals and compare * test CompareGridmixJob only equals and compare
*/ */
@Test (timeout=10000) @Test (timeout=30000)
public void testCompareGridmixJob() throws Exception { public void testCompareGridmixJob() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
Path outRoot = new Path("target"); Path outRoot = new Path("target");
@ -478,7 +478,7 @@ public class TestGridMixClasses {
/* /*
* test ReadRecordFactory. should read all data from inputstream * test ReadRecordFactory. should read all data from inputstream
*/ */
@Test (timeout=1000) @Test (timeout=3000)
public void testReadRecordFactory() throws Exception { public void testReadRecordFactory() throws Exception {
// RecordFactory factory, InputStream src, Configuration conf // RecordFactory factory, InputStream src, Configuration conf
@ -589,7 +589,7 @@ public class TestGridMixClasses {
/* /*
* test LoadRecordReader. It class reads data from some files. * test LoadRecordReader. It class reads data from some files.
*/ */
@Test (timeout=1000) @Test (timeout=3000)
public void testLoadJobLoadRecordReader() throws Exception { public void testLoadJobLoadRecordReader() throws Exception {
LoadJob.LoadRecordReader test = new LoadJob.LoadRecordReader(); LoadJob.LoadRecordReader test = new LoadJob.LoadRecordReader();
Configuration conf = new Configuration(); Configuration conf = new Configuration();
@ -652,7 +652,7 @@ public class TestGridMixClasses {
* test LoadReducer * test LoadReducer
*/ */
@Test (timeout=1000) @Test (timeout=3000)
public void testLoadJobLoadReducer() throws Exception { public void testLoadJobLoadReducer() throws Exception {
LoadJob.LoadReducer test = new LoadJob.LoadReducer(); LoadJob.LoadReducer test = new LoadJob.LoadReducer();
@ -772,7 +772,7 @@ public class TestGridMixClasses {
/* /*
* test SerialJobFactory * test SerialJobFactory
*/ */
@Test (timeout=40000) @Test (timeout=120000)
public void testSerialReaderThread() throws Exception { public void testSerialReaderThread() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
@ -833,7 +833,7 @@ public class TestGridMixClasses {
* test SleepMapper * test SleepMapper
*/ */
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "rawtypes"})
@Test (timeout=10000) @Test (timeout=30000)
public void testSleepMapper() throws Exception { public void testSleepMapper() throws Exception {
SleepJob.SleepMapper test = new SleepJob.SleepMapper(); SleepJob.SleepMapper test = new SleepJob.SleepMapper();
@ -878,7 +878,7 @@ public class TestGridMixClasses {
/* /*
* test SleepReducer * test SleepReducer
*/ */
@Test (timeout=1000) @Test (timeout=3000)
public void testSleepReducer() throws Exception { public void testSleepReducer() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.setInt(JobContext.NUM_REDUCES, 2); conf.setInt(JobContext.NUM_REDUCES, 2);