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 bo...@apache.org on 2013/09/23 20:39:47 UTC
svn commit: r1525673 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
Author: bobby
Date: Mon Sep 23 18:39:47 2013
New Revision: 1525673
URL: http://svn.apache.org/r1525673
Log:
svn merge -c 1525670 FIXES: MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1525673&r1=1525672&r2=1525673&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon Sep 23 18:39:47 2013
@@ -41,6 +41,9 @@ Release 2.3.0 - UNRELEASED
MAPREDUCE-5404. HSAdminServer does not use ephemeral ports in minicluster
mode (Ted Yu via jlowe)
+ MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang
+ via bobby)
+
Release 2.2.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java?rev=1525673&r1=1525672&r2=1525673&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java Mon Sep 23 18:39:47 2013
@@ -128,10 +128,15 @@ public class TestQueue {
assertEquals(secondSubQueue.getJobQueueInfo().getChildren().size(), 0);
// test
assertEquals(manager.getSchedulerInfo("first"), "queueInfo");
- assertEquals(manager.getJobQueueInfos()[0].getQueueName(), secondSubQueue
- .getJobQueueInfo().getQueueName());
- assertEquals(manager.getJobQueueInfos()[1].getQueueName(), firstSubQueue
- .getJobQueueInfo().getQueueName());
+ Set<String> queueJobQueueInfos = new HashSet<String>();
+ for(JobQueueInfo jobInfo : manager.getJobQueueInfos()){
+ queueJobQueueInfos.add(jobInfo.getQueueName());
+ }
+ Set<String> rootJobQueueInfos = new HashSet<String>();
+ for(Queue queue : root.getChildren()){
+ rootJobQueueInfos.add(queue.getJobQueueInfo().getQueueName());
+ }
+ assertEquals(queueJobQueueInfos, rootJobQueueInfos);
// test getJobQueueInfoMapping
assertEquals(
manager.getJobQueueInfoMapping().get("first").getQueueName(), "first");