Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6152. Used queue percentage not accurate in UI for 2.7 and below when using DominantResourceCalculator. Contributed by Jonathan Hung

This commit is contained in:
Eric Payne 2017-02-07 11:33:28 -06:00
parent 086ee0adf8
commit bc3e188e11
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
View File

@ -545,16 +545,17 @@ public abstract class AbstractCSQueue implements CSQueue {
* @return used resources by this queue for specified label
*/
public final synchronized float getUsedCapacity(final String nodeLabel) {
Resource totalPartitionResource =
labelManager.getResourceByLabel(nodeLabel, this.clusterResource);
Resource availableToQueue =
Resources.multiply(
labelManager.getResourceByLabel(nodeLabel, this.clusterResource),
Resources.multiply(totalPartitionResource,
queueCapacities.getAbsoluteCapacity(nodeLabel));
if (!Resources.greaterThan(resourceCalculator, this.clusterResource,
if (!Resources.greaterThan(resourceCalculator, totalPartitionResource,
availableToQueue, Resources.none())) {
return 0.0f;
}
return
Resources.divide(resourceCalculator, this.clusterResource,
Resources.divide(resourceCalculator, totalPartitionResource,
queueUsage.getUsed(nodeLabel), availableToQueue);
}
@ -564,13 +565,13 @@ public abstract class AbstractCSQueue implements CSQueue {
* @return absolute used resources by this queue for specified label
*/
public final synchronized float getAbsoluteUsedCapacity(final String nodeLabel) {
Resource labeledResources =
labelManager.getResourceByLabel(nodeLabel, this.clusterResource);
if (!Resources.greaterThan(resourceCalculator, this.clusterResource,
labeledResources, Resources.none())) {
Resource totalPartitionResource =
labelManager.getResourceByLabel(nodeLabel, this.clusterResource);
if (!Resources.greaterThan(resourceCalculator, totalPartitionResource,
totalPartitionResource, Resources.none())) {
return 0.0f;
}
return Resources.divide(resourceCalculator, this.clusterResource,
queueUsage.getUsed(nodeLabel), labeledResources);
return Resources.divide(resourceCalculator, totalPartitionResource,
queueUsage.getUsed(nodeLabel), totalPartitionResource);
}
}