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 ac...@apache.org on 2008/10/14 23:53:37 UTC
svn commit: r704705 - in /hadoop/core/branches/branch-0.19: ./ CHANGES.txt
src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java
Author: acmurthy
Date: Tue Oct 14 14:53:37 2008
New Revision: 704705
URL: http://svn.apache.org/viewvc?rev=704705&view=rev
Log:
Merge -r 704702:704703 from trunk to branch-0.19 to fix HADOOP-4378.
Modified:
hadoop/core/branches/branch-0.19/ (props changed)
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java
Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 14 14:53:37 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=704705&r1=704704&r2=704705&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Oct 14 14:53:37 2008
@@ -854,6 +854,9 @@
HADOOP-4403. Make TestLeaseRecovery and TestFileCreation more robust.
(szetszwo)
+ HADOOP-4378. Fix TestJobQueueInformation to use SleepJob rather than
+ WordCount via TestMiniMRWithDFS. (Sreekanth Ramakrishnan via acmurthy)
+
Release 0.18.2 - Unreleased
BUG FIXES
Modified: hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java?rev=704705&r1=704704&r2=704705&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java (original)
+++ hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java Tue Oct 14 14:53:37 2008
@@ -28,6 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.examples.SleepJob;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.net.NetUtils;
@@ -87,7 +88,11 @@
assertNotNull(queueInfos);
assertEquals(1, queueInfos.length);
assertEquals("default", queueInfos[0].getQueueName());
- TestMiniMRWithDFS.runWordCount(mrCluster, mrCluster.createJobConf());
+ JobConf conf = mrCluster.createJobConf();
+ SleepJob sleepJob = new SleepJob();
+ sleepJob.setConf(conf);
+ conf = sleepJob.setupJobConf(4, 2, 1, 1, 1, 1);
+ JobClient.runJob(conf);
int numberOfJobs = 0;
for (JobQueueInfo queueInfo : queueInfos) {
@@ -101,7 +106,6 @@
assertEquals(JOB_SCHEDULING_INFO, status.getSchedulingInfo());
}
}
- // Three jobs are launched by runwordcount
- assertEquals(3, numberOfJobs);
+ assertEquals(1, numberOfJobs);
}
}