You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ma...@apache.org on 2011/12/14 21:00:27 UTC
svn commit: r1214434 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/o...
Author: mahadev
Date: Wed Dec 14 20:00:27 2011
New Revision: 1214434
URL: http://svn.apache.org/viewvc?rev=1214434&view=rev
Log:
MAPREDUCE-3541. Fix broken TestJobQueueClient test. (Ravi Prakash via mahadev) - Merging r1214421 from trunk
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobQueueClient.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1214434&r1=1214433&r2=1214434&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed Dec 14 20:00:27 2011
@@ -242,6 +242,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3557. MR1 test fail to compile because of missing hadoop-archives
dependency. (tucu)
+ MAPREDUCE-3541. Fix broken TestJobQueueClient test. (Ravi Prakash via
+ mahadev)
+
MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode.
(Siddharth Seth via vinodkv)
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java?rev=1214434&r1=1214433&r2=1214434&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java Wed Dec 14 20:00:27 2011
@@ -109,7 +109,14 @@ class JobQueueClient extends Configured
return exitcode;
}
+// format and print information about the passed in job queue.
+ void printJobQueueInfo(JobQueueInfo jobQueueInfo, Writer writer)
+ throws IOException {
+ printJobQueueInfo(jobQueueInfo, writer, "");
+ }
+
// format and print information about the passed in job queue.
+ @SuppressWarnings("deprecation")
void printJobQueueInfo(JobQueueInfo jobQueueInfo, Writer writer,
String prefix) throws IOException {
if (jobQueueInfo == null) {
@@ -136,7 +143,7 @@ class JobQueueClient extends Configured
private void displayQueueList() throws IOException {
JobQueueInfo[] rootQueues = jc.getRootQueues();
for (JobQueueInfo queue : rootQueues) {
- printJobQueueInfo(queue, new PrintWriter(System.out), "");
+ printJobQueueInfo(queue, new PrintWriter(System.out));
}
}
@@ -174,7 +181,7 @@ class JobQueueClient extends Configured
System.out.println("Queue \"" + queue + "\" does not exist.");
return;
}
- printJobQueueInfo(jobQueueInfo, new PrintWriter(System.out), "");
+ printJobQueueInfo(jobQueueInfo, new PrintWriter(System.out));
if (showJobs && (jobQueueInfo.getChildren() == null ||
jobQueueInfo.getChildren().size() == 0)) {
JobStatus[] jobs = jc.getJobsFromQueue(queue);
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobQueueClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobQueueClient.java?rev=1214434&r1=1214433&r2=1214434&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobQueueClient.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobQueueClient.java Wed Dec 14 20:00:27 2011
@@ -45,7 +45,7 @@ public class TestJobQueueClient {
ByteArrayOutputStream bbos = new ByteArrayOutputStream();
PrintWriter writer = new PrintWriter(bbos);
- queueClient.printJobQueueInfo(parent, writer, "");
+ queueClient.printJobQueueInfo(parent, writer);
Assert.assertTrue("printJobQueueInfo did not print grandchild's name",
bbos.toString().contains("GrandChildQueue"));
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java?rev=1214434&r1=1214433&r2=1214434&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java Wed Dec 14 20:00:27 2011
@@ -30,6 +30,8 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.Assert;
+
import org.apache.hadoop.mapreduce.QueueInfo;
import org.junit.After;
import org.junit.Test;
@@ -79,14 +81,11 @@ public class TestJobQueueClient {
StringWriter writer = new StringWriter();
client.printJobQueueInfo(root, writer);
- StringBuffer sb = new StringBuffer();
- sb.append("Queue Name : q1 \n");
- sb.append("Queue State : running \n");
- sb.append("Scheduling Info : q1 scheduling info \n");
- sb.append("Child Queues : q1:1, q1:2\n");
- sb.append("======================\n");
-
- assertEquals(sb.toString(), writer.toString());
+ Assert.assertTrue(writer.toString().contains("Queue Name : q1"));
+ Assert.assertTrue(writer.toString().contains("Queue State : running"));
+ Assert.assertTrue(writer.toString().contains("Scheduling Info : q1 scheduling info"));
+ Assert.assertTrue(writer.toString().contains("Queue Name : q1:1"));
+ Assert.assertTrue(writer.toString().contains("Queue Name : q1:2"));
}
@Test