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/AbstractCSQueue.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/AbstractCSQueue.java index 12ce05f2791..28e2d54c494 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/AbstractCSQueue.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/AbstractCSQueue.java @@ -1633,4 +1633,13 @@ public void setDynamicQueue(boolean dynamicQueue) { writeLock.unlock(); } } + + protected String getCapacityOrWeightString() { + if (queueCapacities.getWeight() != -1) { + return "weight=" + queueCapacities.getWeight() + ", " + + "normalizedWeight=" + queueCapacities.getNormalizedWeight(); + } else { + return "capacity=" + queueCapacities.getCapacity(); + } + } } 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 6bf8d0a471a..eb83ceea48f 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 @@ -268,9 +268,8 @@ protected void setupQueueConfigs(Resource clusterResource, usersManager.updateUserWeights(); LOG.info( - "Initializing " + getQueuePath() + "\n" + "capacity = " - + queueCapacities.getCapacity() - + " [= (float) configuredCapacity / 100 ]" + "\n" + "Initializing " + getQueuePath() + "\n" + + getExtendedCapacityOrWeightString() + "\n" + "absoluteCapacity = " + queueCapacities.getAbsoluteCapacity() + " [= parentAbsoluteCapacity * capacity ]" + "\n" + "maxCapacity = " + queueCapacities.getMaximumCapacity() @@ -486,7 +485,7 @@ public QueueInfo getQueueInfo( public String toString() { readLock.lock(); try { - return getQueuePath() + ": " + "capacity=" + queueCapacities.getCapacity() + return getQueuePath() + ": " + getCapacityOrWeightString() + ", " + "absoluteCapacity=" + queueCapacities.getAbsoluteCapacity() + ", " + "usedResources=" + queueUsage.getUsed() + ", " + "usedCapacity=" + getUsedCapacity() + ", " + "absoluteUsedCapacity=" @@ -499,7 +498,19 @@ public String toString() { } finally { readLock.unlock(); } + } + private String getExtendedCapacityOrWeightString() { + if (queueCapacities.getWeight() != -1) { + return "weight = " + queueCapacities.getWeight() + + " [= (float) configuredCapacity (with w suffix)] " + "\n" + + "normalizedWeight = " + queueCapacities.getNormalizedWeight() + + " [= (float) configuredCapacity / sum(configuredCapacity of " + + "all queues under the parent)]"; + } else { + return "capacity = " + queueCapacities.getCapacity() + + " [= (float) configuredCapacity / 100 ]"; + } } @VisibleForTesting 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/ParentQueue.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/ParentQueue.java index f79ffcbb33c..ce5e49040e6 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/ParentQueue.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/ParentQueue.java @@ -173,7 +173,7 @@ protected void setupQueueConfigs(Resource clusterResource, ((ParentQueue) parent).getQueueOrderingPolicyConfigName()); queueOrderingPolicy.setQueues(childQueues); - LOG.info(queueName + ", capacity=" + this.queueCapacities.getCapacity() + LOG.info(queueName + ", " + getCapacityOrWeightString() + ", absoluteCapacity=" + this.queueCapacities.getAbsoluteCapacity() + ", maxCapacity=" + this.queueCapacities.getMaximumCapacity() + ", absoluteMaxCapacity=" + this.queueCapacities @@ -462,8 +462,8 @@ private QueueUserACLInfo getUserAclInfo( public String toString() { return queueName + ": " + - "numChildQueue= " + childQueues.size() + ", " + - "capacity=" + queueCapacities.getCapacity() + ", " + + "numChildQueue= " + childQueues.size() + ", " + + getCapacityOrWeightString() + ", " + "absoluteCapacity=" + queueCapacities.getAbsoluteCapacity() + ", " + "usedResources=" + queueUsage.getUsed() + "usedCapacity=" + getUsedCapacity() + ", " +