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

svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541583 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2013-11-13 16:19:21 +00:00
parent 5653892571
commit 55a9d7dc50
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,8 @@ Release 2.3.0 - UNRELEASED
created by CombineFileInputFormat to fail (Robert Parker and Jason Lowe created by CombineFileInputFormat to fail (Robert Parker and Jason Lowe
via jlowe) via jlowe)
MAPREDUCE-5610. TestSleepJob fails in jdk7 (Jonathan Eagles via jlowe)
Release 2.2.1 - UNRELEASED Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
View File

@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path outRoot, Configuration conf, long submissionMillis, JobStory jobdesc, Path outRoot,
UserGroupInformation ugi, int seq) throws IOException { UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0); int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
if (numLocations < 0) numLocations=0; if (numLocations < 0) numLocations = 0;
if ((numLocations > 0) && (hosts == null)) { if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf)); final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true); ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers(); final int nTrackers = stat.getTaskTrackers();

22
hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
View File

@ -58,17 +58,6 @@ public class TestSleepJob extends CommonJobTest {
} }
/*
* test RandomLocation
*/
@Test (timeout=600000)
public void testRandomLocation() throws Exception {
UserGroupInformation ugi = UserGroupInformation.getLoginUser();
testRandomLocation(1, 10, ugi);
testRandomLocation(2, 10, ugi);
}
@Test (timeout=600000) @Test (timeout=600000)
public void testMapTasksOnlySleepJobs() throws Exception { public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig(); Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@ -90,6 +79,17 @@ public class TestSleepJob extends CommonJobTest {
assertEquals(6, seq); assertEquals(6, seq);
} }
/*
* test RandomLocation
*/
@Test (timeout=600000)
public void testRandomLocation() throws Exception {
UserGroupInformation ugi = UserGroupInformation.getLoginUser();
testRandomLocation(1, 10, ugi);
testRandomLocation(2, 10, ugi);
}
// test Serial submit // test Serial submit
@Test (timeout=600000) @Test (timeout=600000)
public void testSerialSubmit() throws Exception { public void testSerialSubmit() throws Exception {