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 xk...@apache.org on 2018/06/26 05:33:00 UTC
[22/50] [abbrv] hadoop git commit: YARN-8441. Typo in CSQueueUtils
local variable names: queueGuranteedResource. Contributed by Szilard Nemeth.
YARN-8441. Typo in CSQueueUtils local variable names: queueGuranteedResource. Contributed by Szilard Nemeth.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46f90581
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46f90581
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46f90581
Branch: refs/heads/HDFS-12943
Commit: 46f90581641feec37e285964df983d221bee5e1d
Parents: 388fafa
Author: Miklos Szegedi <mi...@cloudera.com>
Authored: Wed Jun 20 11:58:18 2018 -0700
Committer: Miklos Szegedi <mi...@cloudera.com>
Committed: Wed Jun 20 11:58:18 2018 -0700
----------------------------------------------------------------------
.../scheduler/capacity/CSQueueUtils.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/46f90581/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueUtils.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/CSQueueUtils.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/CSQueueUtils.java
index 0dfce83..b5edbf7 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/CSQueueUtils.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/CSQueueUtils.java
@@ -184,7 +184,7 @@ public class CSQueueUtils {
if (Resources.greaterThan(rc, totalPartitionResource,
totalPartitionResource, Resources.none())) {
- Resource queueGuranteedResource = childQueue
+ Resource queueGuaranteedResource = childQueue
.getEffectiveCapacity(nodePartition);
//TODO : Modify below code to support Absolute Resource configurations
@@ -204,14 +204,14 @@ public class CSQueueUtils {
QueueCapacities leafQueueTemplateCapacities = parentQueue
.getLeafQueueTemplate()
.getQueueCapacities();
- queueGuranteedResource = Resources.multiply(totalPartitionResource,
+ queueGuaranteedResource = Resources.multiply(totalPartitionResource,
leafQueueTemplateCapacities.getAbsoluteCapacity
(nodePartition));
}
// make queueGuranteed >= minimum_allocation to avoid divided by 0.
- queueGuranteedResource =
- Resources.max(rc, totalPartitionResource, queueGuranteedResource,
+ queueGuaranteedResource =
+ Resources.max(rc, totalPartitionResource, queueGuaranteedResource,
minimumAllocation);
Resource usedResource = queueResourceUsage.getUsed(nodePartition);
@@ -220,12 +220,12 @@ public class CSQueueUtils {
totalPartitionResource);
usedCapacity =
Resources.divide(rc, totalPartitionResource, usedResource,
- queueGuranteedResource);
+ queueGuaranteedResource);
Resource resResource = queueResourceUsage.getReserved(nodePartition);
reservedCapacity =
Resources.divide(rc, totalPartitionResource, resResource,
- queueGuranteedResource);
+ queueGuaranteedResource);
absoluteReservedCapacity =
Resources.divide(rc, totalPartitionResource, resResource,
totalPartitionResource);
@@ -258,16 +258,16 @@ public class CSQueueUtils {
for (String partition : nodeLabels) {
// Calculate guaranteed resource for a label in a queue by below logic.
// (total label resource) * (absolute capacity of label in that queue)
- Resource queueGuranteedResource = queue.getEffectiveCapacity(partition);
+ Resource queueGuaranteedResource = queue.getEffectiveCapacity(partition);
// Available resource in queue for a specific label will be calculated as
// {(guaranteed resource for a label in a queue) -
// (resource usage of that label in the queue)}
// Finally accumulate this available resource to get total.
Resource available = (Resources.greaterThan(rc, cluster,
- queueGuranteedResource,
+ queueGuaranteedResource,
queue.getQueueResourceUsage().getUsed(partition))) ? Resources
- .componentwiseMax(Resources.subtractFrom(queueGuranteedResource,
+ .componentwiseMax(Resources.subtractFrom(queueGuaranteedResource,
queue.getQueueResourceUsage().getUsed(partition)), Resources
.none()) : Resources.none();
Resources.addTo(totalAvailableResource, available);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org