Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E6269EF2 for ; Fri, 6 Apr 2012 05:08:25 +0000 (UTC) Received: (qmail 5467 invoked by uid 500); 6 Apr 2012 05:08:25 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 5234 invoked by uid 500); 6 Apr 2012 05:08:22 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 5208 invoked by uid 99); 6 Apr 2012 05:08:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Apr 2012 05:08:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Apr 2012 05:08:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9AE4E2388BF1; Fri, 6 Apr 2012 05:07:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1310174 - in /hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop... Date: Fri, 06 Apr 2012 05:07:41 -0000 To: mapreduce-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120406050741.9AE4E2388BF1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: todd Date: Fri Apr 6 05:07:33 2012 New Revision: 1310174 URL: http://svn.apache.org/viewvc?rev=1310174&view=rev Log: Merge trunk into auto-failover branch. Addressed two semantic conflicts after the commit of HADOOP-8077 -- test code was referencing the old constant for the fencing methods config key. Added: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java - copied unchanged from r1310173, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/ - copied from r1310173, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/ - copied from r1310173, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/ - copied from r1310173, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java - copied unchanged from r1310173, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java Removed: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/conf/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/pom.xml hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/pom.xml hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/c++/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/block_forensics/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/build-contrib.xml (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/build.xml (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/data_join/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/index/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/examples/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/java/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/webapps/job/ (props changed) Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1309568-1310173 Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt Fri Apr 6 05:07:33 2012 @@ -201,6 +201,9 @@ Release 2.0.0 - UNRELEASED (Colin Patrick McCabe via eli) MAPREDUCE-4098. TestMRApps testSetClasspath fails (tucu) + + MAPREDUCE-4097. tools testcases fail because missing mrapp-generated-classpath + file in classpath (rvs via tucu) Release 0.23.3 - UNRELEASED @@ -254,6 +257,13 @@ Release 0.23.3 - UNRELEASED directory (John George via bobby) MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby) + + MAPREDUCE-3621. TestDBJob and TestDataDrivenDBInputFormat ant tests fail + (Ravi Prakash via tgraves) + + MAPREDUCE-4073. CS assigns multiple off-switch containers when using + multi-level-queues (Siddharth Seth via bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/conf/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1309568-1310173 Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml Fri Apr 6 05:07:33 2012 @@ -93,21 +93,6 @@ - maven-dependency-plugin - - - build-classpath - generate-sources - - build-classpath - - - target/classes/mrapp-generated-classpath - - - - - maven-antrun-plugin Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1309568-1310173 Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml Fri Apr 6 05:07:33 2012 @@ -88,6 +88,12 @@ test test-jar + + org.hsqldb + hsqldb + 2.0.0 + test + Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml Fri Apr 6 05:07:33 2012 @@ -86,10 +86,6 @@ org.mortbay.jetty jsp-2.1-jetty - - hsqldb - hsqldb - Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml Fri Apr 6 05:07:33 2012 @@ -92,6 +92,11 @@ hadoop-mapreduce-client-hs test + + org.hsqldb + hsqldb + 2.0.0 + Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java Fri Apr 6 05:07:33 2012 @@ -49,7 +49,7 @@ import org.apache.hadoop.mapreduce.lib.r import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.hsqldb.Server; +import org.hsqldb.server.Server; /** * This is a demonstrative program, which uses DBInputFormat for reading @@ -78,7 +78,7 @@ public class DBCountPageView extends Con private static final String DB_URL = "jdbc:hsqldb:hsql://localhost/URLAccess"; - private static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver"; + private static final String DRIVER_CLASS = "org.hsqldb.jdbc.JDBCDriver"; private Server server; Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java Fri Apr 6 05:07:33 2012 @@ -26,7 +26,7 @@ import org.apache.hadoop.yarn.server.res @Unstable public class CSAssignment { final private Resource resource; - final private NodeType type; + private NodeType type; public CSAssignment(Resource resource, NodeType type) { this.resource = resource; @@ -41,6 +41,10 @@ public class CSAssignment { return type; } + public void setType(NodeType type) { + this.type = type; + } + @Override public String toString() { return resource.getMemory() + ":" + type; Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java Fri Apr 6 05:07:33 2012 @@ -519,7 +519,6 @@ public class ParentQueue implements CSQu Resource clusterResource, SchedulerNode node) { CSAssignment assignment = new CSAssignment(Resources.createResource(0), NodeType.NODE_LOCAL); - boolean assignedOffSwitch = false; while (canAssign(node)) { if (LOG.isDebugEnabled()) { @@ -535,7 +534,7 @@ public class ParentQueue implements CSQu // Schedule CSAssignment assignedToChild = assignContainersToChildQueues(clusterResource, node); - assignedOffSwitch = (assignedToChild.getType() == NodeType.OFF_SWITCH); + assignment.setType(assignedToChild.getType()); // Done if no child-queue assigned anything if (Resources.greaterThan(assignedToChild.getResource(), @@ -566,15 +565,13 @@ public class ParentQueue implements CSQu // Do not assign more than one container if this isn't the root queue // or if we've already assigned an off-switch container - if (rootQueue) { - if (assignedOffSwitch) { - if (LOG.isDebugEnabled()) { + if (!rootQueue || assignment.getType() == NodeType.OFF_SWITCH) { + if (LOG.isDebugEnabled()) { + if (rootQueue && assignment.getType() == NodeType.OFF_SWITCH) { LOG.debug("Not assigning more than one off-switch container," + - " assignments so far: " + assignment); + " assignments so far: " + assignment); } - break; } - } else { break; } } Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java Fri Apr 6 05:07:33 2012 @@ -499,6 +499,71 @@ public class TestParentQueue { } + @Test + public void testOffSwitchSchedulingMultiLevelQueues() throws Exception { + // Setup queue configs + setupMultiLevelQueues(csConf); + //B3 + Map queues = new HashMap(); + CSQueue root = + CapacityScheduler.parseQueue(csContext, csConf, null, + CapacitySchedulerConfiguration.ROOT, queues, queues, + CapacityScheduler.queueComparator, + CapacityScheduler.applicationComparator, + TestUtils.spyHook); + + // Setup some nodes + final int memoryPerNode = 10; + final int numNodes = 2; + + SchedulerNode node_0 = + TestUtils.getMockNode("host_0", DEFAULT_RACK, 0, memoryPerNode*GB); + SchedulerNode node_1 = + TestUtils.getMockNode("host_1", DEFAULT_RACK, 0, memoryPerNode*GB); + + final Resource clusterResource = + Resources.createResource(numNodes * (memoryPerNode*GB)); + when(csContext.getNumClusterNodes()).thenReturn(numNodes); + + // Start testing + LeafQueue b3 = (LeafQueue)queues.get(B3); + LeafQueue b2 = (LeafQueue)queues.get(B2); + + // Simulate B3 returning a container on node_0 + stubQueueAllocation(b2, clusterResource, node_0, 0*GB, NodeType.OFF_SWITCH); + stubQueueAllocation(b3, clusterResource, node_0, 1*GB, NodeType.OFF_SWITCH); + root.assignContainers(clusterResource, node_0); + verifyQueueMetrics(b2, 0*GB, clusterResource); + verifyQueueMetrics(b3, 1*GB, clusterResource); + + // Now, B2 should get the scheduling opportunity since B2=0G/2G, B3=1G/7G + // also, B3 gets a scheduling opportunity since B2 allocates RACK_LOCAL + stubQueueAllocation(b2, clusterResource, node_1, 1*GB, NodeType.RACK_LOCAL); + stubQueueAllocation(b3, clusterResource, node_1, 1*GB, NodeType.OFF_SWITCH); + root.assignContainers(clusterResource, node_1); + InOrder allocationOrder = inOrder(b2, b3); + allocationOrder.verify(b2).assignContainers(eq(clusterResource), + any(SchedulerNode.class)); + allocationOrder.verify(b3).assignContainers(eq(clusterResource), + any(SchedulerNode.class)); + verifyQueueMetrics(b2, 1*GB, clusterResource); + verifyQueueMetrics(b3, 2*GB, clusterResource); + + // Now, B3 should get the scheduling opportunity + // since B2 has 1/2G while B3 has 2/7G, + // However, since B3 returns off-switch, B2 won't get an opportunity + stubQueueAllocation(b2, clusterResource, node_0, 1*GB, NodeType.NODE_LOCAL); + stubQueueAllocation(b3, clusterResource, node_0, 1*GB, NodeType.OFF_SWITCH); + root.assignContainers(clusterResource, node_0); + allocationOrder = inOrder(b3, b2); + allocationOrder.verify(b3).assignContainers(eq(clusterResource), + any(SchedulerNode.class)); + allocationOrder.verify(b2).assignContainers(eq(clusterResource), + any(SchedulerNode.class)); + verifyQueueMetrics(b2, 1*GB, clusterResource); + verifyQueueMetrics(b3, 3*GB, clusterResource); + + } public boolean hasQueueACL(List aclInfos, QueueACL acl, String qName) { for (QueueUserACLInfo aclInfo : aclInfos) { Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/pom.xml Fri Apr 6 05:07:33 2012 @@ -55,10 +55,6 @@ org.mortbay.jetty jsp-2.1-jetty - - hsqldb - hsqldb - Modified: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/pom.xml Fri Apr 6 05:07:33 2012 @@ -100,10 +100,6 @@ org.mortbay.jetty jsp-2.1-jetty - - hsqldb - hsqldb - Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/c++/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/c++:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/block_forensics/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/build-contrib.xml ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/build.xml ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/data_join/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/index/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/vaidya/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/examples/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/examples:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/java:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1309568-1310173 Propchange: hadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/webapps/job/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:r1309568-1310173