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 jl...@apache.org on 2016/05/23 15:55:50 UTC
hadoop git commit: YARN-5055. max apps per user can be larger than
max per queue. Contributed by Eric Badger
Repository: hadoop
Updated Branches:
refs/heads/trunk d1df0266c -> ac954486c
YARN-5055. max apps per user can be larger than max per queue. Contributed by Eric Badger
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ac954486
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac954486
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac954486
Branch: refs/heads/trunk
Commit: ac954486c5102b8fbbc4229a0d3a512bcc7013c0
Parents: d1df026
Author: Jason Lowe <jl...@apache.org>
Authored: Mon May 23 15:54:42 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon May 23 15:54:42 2016 +0000
----------------------------------------------------------------------
.../resourcemanager/scheduler/capacity/LeafQueue.java | 4 ++--
.../scheduler/capacity/TestApplicationLimits.java | 9 +++++----
.../webapp/TestRMWebServicesCapacitySched.java | 5 +++--
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac954486/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
index fbcb91c..d562f34 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
@@ -175,8 +175,8 @@ public class LeafQueue extends AbstractCSQueue {
maxApplications =
(int) (maxSystemApps * queueCapacities.getAbsoluteCapacity());
}
- maxApplicationsPerUser =
- (int)(maxApplications * (userLimit / 100.0f) * userLimitFactor);
+ maxApplicationsPerUser = Math.min(maxApplications,
+ (int)(maxApplications * (userLimit / 100.0f) * userLimitFactor));
maxAMResourcePerQueuePercent =
conf.getMaximumApplicationMasterResourcePerQueuePercent(getQueuePath());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac954486/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
index e668d94..8a3051b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
@@ -326,8 +326,9 @@ public class TestApplicationLimits {
queue.getAbsoluteCapacity());
assertEquals(expectedMaxApps, queue.getMaxApplications());
- int expectedMaxAppsPerUser = (int)(expectedMaxApps *
- (queue.getUserLimit()/100.0f) * queue.getUserLimitFactor());
+ int expectedMaxAppsPerUser = Math.min(expectedMaxApps,
+ (int)(expectedMaxApps * (queue.getUserLimit()/100.0f) *
+ queue.getUserLimitFactor()));
assertEquals(expectedMaxAppsPerUser, queue.getMaxApplicationsPerUser());
// should default to global setting if per queue setting not set
@@ -377,8 +378,8 @@ public class TestApplicationLimits {
assertEquals(9999, (int)csConf.getMaximumApplicationsPerQueue(queue.getQueuePath()));
assertEquals(9999, queue.getMaxApplications());
- expectedMaxAppsPerUser = (int)(9999 *
- (queue.getUserLimit()/100.0f) * queue.getUserLimitFactor());
+ expectedMaxAppsPerUser = Math.min(9999, (int)(9999 *
+ (queue.getUserLimit()/100.0f) * queue.getUserLimitFactor()));
assertEquals(expectedMaxAppsPerUser, queue.getMaxApplicationsPerUser());
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac954486/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
index 12f0c8b..9379367 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
@@ -438,8 +438,9 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase {
int maxSystemApps = csConf.getMaximumSystemApplications();
int expectedMaxApps = (int)(maxSystemApps * (info.absoluteCapacity/100));
- int expectedMaxAppsPerUser =
- (int)(expectedMaxApps * (info.userLimit/100.0f) * info.userLimitFactor);
+ int expectedMaxAppsPerUser = Math.min(expectedMaxApps,
+ (int)(expectedMaxApps * (info.userLimit/100.0f) *
+ info.userLimitFactor));
// TODO: would like to use integer comparisons here but can't due to
// roundoff errors in absolute capacity calculations
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org