svn commit: r1484569 [1/2] - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
Author: cos Date: Mon May 20 19:32:48 2013 New Revision: 1484569 URL: http://svn.apache.org/r1484569 Log: Replacing CRLF's in the releasenotes.html file with LF's (the file seems to be corrupted during auto-generation) Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
svn commit: r1484571 - in /hadoop/common/branches/branch-2.0.4-alpha: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ h
Author: cos Date: Mon May 20 19:32:57 2013 New Revision: 1484571 URL: http://svn.apache.org/r1484571 Log: Setting the version to 2.0.4.1-SNAPSHOT Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-minicluster/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-project-dist/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-archives/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-datajoin/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-extras/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-pipes/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-tools-dist/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/pom.xml hadoop/common/branches/branch-2.0.4-alpha/pom.xml Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml Mon May 20 19:32:57 2013 @@ -23,12 +23,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../hadoop-project/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-assemblies/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version nameApache Hadoop Assemblies/name descriptionApache Hadoop Assemblies/description Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml Mon May 20 19:32:57 2013 @@ -18,12 +18,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project-dist/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../hadoop-project-dist/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-client/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version packagingjar/packaging descriptionApache Hadoop Client/description Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml Mon May 20 19:32:57 2013 @@ -20,12 +20,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../hadoop-project/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-dist/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version descriptionApache Hadoop Distribution/description nameApache Hadoop Distribution/name packagingjar/packaging Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml Mon May 20 19:32:57 2013 @@ -19,7 +19,7 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project/artifactId -version2.0.4-alpha/version +
svn commit: r1484571 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml pom.xml
Author: cos Date: Mon May 20 19:32:57 2013 New Revision: 1484571 URL: http://svn.apache.org/r1484571 Log: Setting the version to 2.0.4.1-SNAPSHOT Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml Mon May 20 19:32:57 2013 @@ -20,12 +20,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../../hadoop-project/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version descriptionApache Hadoop Annotations/description nameApache Hadoop Annotations/name packagingjar/packaging Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml Mon May 20 19:32:57 2013 @@ -20,12 +20,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../../hadoop-project/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-auth-examples/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version packagingwar/packaging nameApache Hadoop Auth Examples/name Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml Mon May 20 19:32:57 2013 @@ -20,12 +20,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../../hadoop-project/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-auth/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version packagingjar/packaging nameApache Hadoop Auth/name Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml?rev=1484571r1=1484570r2=1484571view=diff == --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml Mon May 20 19:32:57 2013 @@ -20,12 +20,12 @@ parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-project-dist/artifactId -version2.0.4-alpha/version +version2.0.4.1-SNAPSHOT/version relativePath../../hadoop-project-dist/relativePath /parent groupIdorg.apache.hadoop/groupId artifactIdhadoop-common/artifactId - version2.0.4-alpha/version + version2.0.4.1-SNAPSHOT/version descriptionApache Hadoop Common/description nameApache Hadoop Common/name packagingjar/packaging Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml URL:
svn commit: r1484577 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
Author: hitesh
Date: Mon May 20 20:12:35 2013
New Revision: 1484577
URL: http://svn.apache.org/r1484577
Log:
MAPREDUCE-5095. TestShuffleExceptionCount#testCheckException fails occasionally
with JDK7. (Contributed by Arpit Agarwal)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1484577r1=1484576r2=1484577view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May 20 20:12:35 2013
@@ -49,6 +49,9 @@ Release 1.3.0 - unreleased
MAPREDUCE-5217. Fix DistCP to work when launched by Oozie on a secure
cluster. (Venkat Ranganathan via sseth)
+MAPREDUCE-5095. TestShuffleExceptionCount#testCheckException fails
+occasionally with JDK7 (Arpit Agarwal via hitesh)
+
Release 1.2.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java?rev=1484577r1=1484576r2=1484577view=diff
==
---
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
(original)
+++
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
Mon May 20 20:12:35 2013
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
public class TestShuffleExceptionCount {
@@ -31,8 +31,8 @@ public class TestShuffleExceptionCount {
static boolean abortCalled = false;
private final float epsilon = 1e-5f;
- @BeforeClass
- public static void initialize() throws Exception {
+ @Before
+ public void initialize() throws Exception {
abortCalled = false;
}
@@ -52,7 +52,6 @@ public class TestShuffleExceptionCount {
@Test
public void testCheckException() throws IOException, InterruptedException {
-
// first test with only MsgRegex set but doesn't match
String exceptionMsgRegex = Broken pipe;
String exceptionStackRegex = null;
svn commit: r1484596 - in /hadoop/common/branches/branch-1: ./ src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/
Author: acmurthy
Date: Mon May 20 21:07:49 2013
New Revision: 1484596
URL: http://svn.apache.org/r1484596
Log:
MAPREDUCE-3859. Fix CapacityScheduler to correctly compute runtime queue limits
for high-ram jobs. Contributed by Sergey Tryuber.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1484596r1=1484595r2=1484596view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May 20 21:07:49 2013
@@ -69,6 +69,9 @@ Release 1.2.1 - Unreleased
available for previous installs by putting it in hadoop-core.jar.
(acmurthy)
+MAPREDUCE-3859. Fix CapacityScheduler to correctly compute runtime queue
+limits for high-ram jobs. (Sergey Tryuber via acmurthy)
+
Release 1.2.0 - 2013.05.05
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java?rev=1484596r1=1484595r2=1484596view=diff
==
---
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
(original)
+++
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
Mon May 20 21:07:49 2013
@@ -1157,7 +1157,7 @@ class CapacitySchedulerQueue {
int queueSlotsOccupied = getNumSlotsOccupied(taskType);
int currentCapacity;
-if (queueSlotsOccupied queueCapacity) {
+if (queueSlotsOccupied + numSlotsRequested = queueCapacity) {
currentCapacity = queueCapacity;
}
else {
Modified:
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java?rev=1484596r1=1484595r2=1484596view=diff
==
---
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
(original)
+++
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Mon May 20 21:07:49 2013
@@ -702,12 +702,18 @@ public class TestCapacityScheduler exten
float capacity;
boolean supportsPrio;
int ulMin;
+Float ulFactor;
public FakeQueueInfo(String queueName, float capacity, boolean
supportsPrio, int ulMin) {
+ this(queueName, capacity, supportsPrio, ulMin, null);
+}
+
+public FakeQueueInfo(String queueName, float capacity, boolean
supportsPrio, int ulMin, Float ulFactor) {
this.queueName = queueName;
this.capacity = capacity;
this.supportsPrio = supportsPrio;
this.ulMin = ulMin;
+ this.ulFactor = ulFactor;
}
}
@@ -733,18 +739,29 @@ public class TestCapacityScheduler exten
/*public synchronized String getFirstQueue() {
return firstQueue;
}*/
-
+
+@Override
public float getCapacity(String queue) {
if(queueMap.get(queue).capacity == -1) {
return super.getCapacity(queue);
}
return queueMap.get(queue).capacity;
}
-
+
+@Override
public int getMinimumUserLimitPercent(String queue) {
return queueMap.get(queue).ulMin;
}
-
+
+@Override
+public float getUserLimitFactor(String queue) {
+ if(queueMap.get(queue).ulFactor != null) {
+return queueMap.get(queue).ulFactor;
+ }
+ return super.getUserLimitFactor(queue);
+}
+
+@Override
public boolean isPrioritySupported(String queue) {
return queueMap.get(queue).supportsPrio;
}
@@ -1333,6 +1350,88 @@ public class TestCapacityScheduler exten
}
/**
+ * Test checks that high memory job is able to consume more slots then
+ * queue's configured capacity, but not more then max capacity.
+ * (of course, if user-limit-factor was set up properly)
+ */
+ public void testHighMemoryCanConsumeMaxCapacity() throws IOException {
+//cluster with 20 map and 20 reduce slots
+final int NUM_MAP_SLOTS = 4;
+final int NUM_REDUCE_SLOTS = 4;
+final int
svn commit: r1484597 - in /hadoop/common/branches/branch-1.2: ./ src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/
Author: acmurthy
Date: Mon May 20 21:08:36 2013
New Revision: 1484597
URL: http://svn.apache.org/r1484597
Log:
Merge -c 1484596 from branch-1 to branch-1.2 to fix MAPREDUCE-3859. Fix
CapacityScheduler to correctly compute runtime queue limits for high-ram jobs.
Contributed by Sergey Tryuber.
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1484597r1=1484596r2=1484597view=diff
==
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Mon May 20 21:08:36 2013
@@ -17,6 +17,9 @@ Release 1.2.1 - Unreleased
available for previous installs by putting it in hadoop-core.jar.
(acmurthy)
+MAPREDUCE-3859. Fix CapacityScheduler to correctly compute runtime queue
+limits for high-ram jobs. (Sergey Tryuber via acmurthy)
+
Release 1.2.0 - 2013.05.05
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java?rev=1484597r1=1484596r2=1484597view=diff
==
---
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
(original)
+++
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java
Mon May 20 21:08:36 2013
@@ -1157,7 +1157,7 @@ class CapacitySchedulerQueue {
int queueSlotsOccupied = getNumSlotsOccupied(taskType);
int currentCapacity;
-if (queueSlotsOccupied queueCapacity) {
+if (queueSlotsOccupied + numSlotsRequested = queueCapacity) {
currentCapacity = queueCapacity;
}
else {
Modified:
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java?rev=1484597r1=1484596r2=1484597view=diff
==
---
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
(original)
+++
hadoop/common/branches/branch-1.2/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Mon May 20 21:08:36 2013
@@ -702,12 +702,18 @@ public class TestCapacityScheduler exten
float capacity;
boolean supportsPrio;
int ulMin;
+Float ulFactor;
public FakeQueueInfo(String queueName, float capacity, boolean
supportsPrio, int ulMin) {
+ this(queueName, capacity, supportsPrio, ulMin, null);
+}
+
+public FakeQueueInfo(String queueName, float capacity, boolean
supportsPrio, int ulMin, Float ulFactor) {
this.queueName = queueName;
this.capacity = capacity;
this.supportsPrio = supportsPrio;
this.ulMin = ulMin;
+ this.ulFactor = ulFactor;
}
}
@@ -733,18 +739,29 @@ public class TestCapacityScheduler exten
/*public synchronized String getFirstQueue() {
return firstQueue;
}*/
-
+
+@Override
public float getCapacity(String queue) {
if(queueMap.get(queue).capacity == -1) {
return super.getCapacity(queue);
}
return queueMap.get(queue).capacity;
}
-
+
+@Override
public int getMinimumUserLimitPercent(String queue) {
return queueMap.get(queue).ulMin;
}
-
+
+@Override
+public float getUserLimitFactor(String queue) {
+ if(queueMap.get(queue).ulFactor != null) {
+return queueMap.get(queue).ulFactor;
+ }
+ return super.getUserLimitFactor(queue);
+}
+
+@Override
public boolean isPrioritySupported(String queue) {
return queueMap.get(queue).supportsPrio;
}
@@ -1333,6 +1350,88 @@ public class TestCapacityScheduler exten
}
/**
+ * Test checks that high memory job is able to consume more slots then
+ * queue's configured capacity, but not more then max capacity.
+ * (of course, if user-limit-factor was set up properly)
+ */
+ public void testHighMemoryCanConsumeMaxCapacity() throws IOException {
+//cluster with 20 map and 20 reduce slots
+final
