This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f544ef4 YARN-11033. isAbsoluteResource is not correct for dynamically
created queues. Contributed by Tamas Domok
f544ef4 is described below
commit f544ef4a51007be24592b9b3dc91bfd73c2f7a88
Author: Szilard Nemeth <snem...@apache.org>
AuthorDate: Fri Dec 10 15:09:53 2021 +0100
YARN-11033. isAbsoluteResource is not correct for dynamically created
queues. Contributed by Tamas Domok
---
.../webapp/dao/CapacitySchedulerInfo.java | 5 +
.../webapp/dao/CapacitySchedulerQueueInfo.java | 12 +-
...estRMWebServicesCapacitySchedDynamicConfig.java | 35 +-
.../TestRMWebServicesForCSWithPartitions.java | 2 +-
.../webapp/scheduler-response-AbsoluteMode.json | 3 +-
...r-response-AbsoluteModeLegacyAutoCreation.json} | 825 +++++++++++----------
.../scheduler-response-NodeLabelDefaultAPI.xml | 3 +-
.../scheduler-response-PerUserResources.json | 3 +-
.../webapp/scheduler-response-PerUserResources.xml | 3 +-
.../webapp/scheduler-response-PercentageMode.json | 3 +-
...-response-PercentageModeLegacyAutoCreation.json | 3 +-
.../webapp/scheduler-response-WeightMode.json | 3 +-
...onse-WeightModeWithAutoCreatedQueues-After.json | 3 +-
...nse-WeightModeWithAutoCreatedQueues-Before.json | 3 +-
.../test/resources/webapp/scheduler-response.json | 3 +-
.../test/resources/webapp/scheduler-response.xml | 3 +-
16 files changed, 477 insertions(+), 435 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerInfo.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerInfo.java
index c09ab54..74c7c20 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerInfo.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerInfo.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AbstractCSQueue;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueue;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
@@ -49,6 +50,7 @@ public class CapacitySchedulerInfo extends SchedulerInfo {
protected String queueName;
private String queuePath;
protected int maxParallelApps;
+ private boolean isAbsoluteResource;
protected CapacitySchedulerQueueInfoList queues;
protected QueueCapacitiesInfo capacities;
protected CapacitySchedulerHealthInfo health;
@@ -90,6 +92,9 @@ public class CapacitySchedulerInfo extends SchedulerInfo {
health = new CapacitySchedulerHealthInfo(cs);
maximumAllocation = new ResourceInfo(parent.getMaximumAllocation());
+ isAbsoluteResource = parent.getCapacityConfigType() ==
+ AbstractCSQueue.CapacityConfigType.ABSOLUTE_RESOURCE;
+
CapacitySchedulerConfiguration conf = cs.getConfiguration();
queueAcls = new QueueAclsInfo();
queueAcls.addAll(getSortedQueueAclInfoList(queueName, conf));
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java
index e27054d..78b5392 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.yarn.api.records.QueueState;
import org.apache.hadoop.yarn.security.AccessType;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueResourceQuotas;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceUsage;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AbstractCSQueue;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueue;
@@ -43,11 +44,6 @@ import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.PlanQueu
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueueCapacities;
import
org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.helper.CapacitySchedulerInfoHelper;
-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.
- CapacitySchedulerConfiguration.RESOURCE_PATTERN;
-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.
- CapacitySchedulerConfiguration.CAPACITY;
-
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@XmlSeeAlso({CapacitySchedulerLeafQueueInfo.class})
@@ -179,10 +175,8 @@ public class CapacitySchedulerQueueInfo {
.getLeafOnlyProperties());
}
- String configuredCapacity = conf.get(
- CapacitySchedulerConfiguration.getQueuePrefix(queuePath) + CAPACITY);
- isAbsoluteResource = (configuredCapacity != null)
- && RESOURCE_PATTERN.matcher(configuredCapacity).find();
+ isAbsoluteResource = q.getCapacityConfigType() ==
+ AbstractCSQueue.CapacityConfigType.ABSOLUTE_RESOURCE;
autoCreateChildQueueEnabled = conf.
isAutoCreateChildQueueEnabled(queuePath);
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/TestRMWebServicesCapacitySchedDynamicConfig.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java
index 1a87dd0..df4f18e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java
@@ -137,6 +137,22 @@ public class TestRMWebServicesCapacitySchedDynamicConfig
extends
}
@Test
+ public void testSchedulerResponseAbsoluteModeLegacyAutoCreation()
+ throws Exception {
+ Configuration config = CSConfigGenerator
+ .createAbsoluteConfigLegacyAutoCreation();
+ config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
+ YarnConfiguration.MEMORY_CONFIGURATION_STORE);
+
+ initResourceManager(config);
+ initAutoQueueHandler(8192 * GB);
+ createQueue("root.managed.queue1");
+
+ assertJsonResponse(sendRequest(),
+ "webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json");
+ }
+
+ @Test
public void testSchedulerResponseAbsoluteMode()
throws Exception {
Configuration config = CSConfigGenerator
@@ -189,7 +205,7 @@ public class TestRMWebServicesCapacitySchedDynamicConfig
extends
"maximum-applications", 300);
initResourceManager(config);
- initAutoQueueHandler();
+ initAutoQueueHandler(1200 * GB);
// same as webapp/scheduler-response-WeightMode.json, but with effective
resources filled in
assertJsonResponse(sendRequest(),
@@ -212,10 +228,10 @@ public class TestRMWebServicesCapacitySchedDynamicConfig
extends
"webapp/scheduler-response-WeightModeWithAutoCreatedQueues-After.json");
}
- private void initAutoQueueHandler() throws Exception {
+ private void initAutoQueueHandler(int nodeMemory) throws Exception {
CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler();
autoQueueHandler = cs.getCapacitySchedulerQueueManager();
- rm.registerNode("h1:1234", 1200 * GB); // label = x
+ rm.registerNode("h1:1234", nodeMemory); // label = x
}
private void createQueue(String queuePath) throws YarnException,
@@ -255,6 +271,19 @@ public class TestRMWebServicesCapacitySchedDynamicConfig
extends
return createConfiguration(conf);
}
+ public static Configuration createAbsoluteConfigLegacyAutoCreation() {
+ Map<String, String> conf = new HashMap<>();
+ conf.put("yarn.scheduler.capacity.root.queues", "default, managed");
+ conf.put("yarn.scheduler.capacity.root.default.state", "STOPPED");
+ conf.put("yarn.scheduler.capacity.root.managed.capacity",
"[memory=4096,vcores=4]");
+
conf.put("yarn.scheduler.capacity.root.managed.leaf-queue-template.capacity",
+ "[memory=2048,vcores=2]");
+ conf.put("yarn.scheduler.capacity.root.managed.state", "RUNNING");
+ conf.put("yarn.scheduler.capacity.root.managed." +
+ "auto-create-child-queue.enabled", "true");
+ return createConfiguration(conf);
+ }
+
public static Configuration createAbsoluteConfig() {
Map<String, String> conf = new HashMap<>();
conf.put("yarn.scheduler.capacity.root.queues", "default, test1, test2");
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/TestRMWebServicesForCSWithPartitions.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
index db9cbe6..0697ad0 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
@@ -574,7 +574,7 @@ public class TestRMWebServicesForCSWithPartitions extends
JerseyTestBase {
JSONObject info = json.getJSONObject("scheduler");
assertEquals("incorrect number of elements", 1, info.length());
info = info.getJSONObject("schedulerInfo");
- assertEquals("incorrect number of elements", 23, info.length());
+ assertEquals("incorrect number of elements", 24, info.length());
JSONObject capacitiesJsonObject = info.getJSONObject(CAPACITIES);
JSONArray partitionsCapsArray =
capacitiesJsonObject.getJSONArray(QUEUE_CAPACITIES_BY_PARTITION);
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteMode.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteMode.json
index 4909727..fb515d5 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteMode.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteMode.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": true,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
@@ -1735,4 +1736,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json
similarity index 73%
copy from
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
copy to
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json
index 3abe605..7580005 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json
@@ -8,23 +8,24 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
- "queuePath": "root.test1",
- "capacity": 50,
+ "queuePath": "root.default",
+ "capacity": 0,
"usedCapacity": 0,
"maxCapacity": 100,
- "absoluteCapacity": 50,
+ "absoluteCapacity": 0,
"absoluteMaxCapacity": 100,
"absoluteUsedCapacity": 0,
"weight": -1,
"normalizedWeight": 0,
"numApplications": 0,
"maxParallelApps": 2147483647,
- "queueName": "test1",
+ "queueName": "default",
"isAbsoluteResource": false,
- "state": "RUNNING",
+ "state": "STOPPED",
"resourcesUsed": {
"memory": 0,
"vCores": 0,
@@ -56,10 +57,10 @@
"pendingContainers": 0,
"capacities": {"queueCapacitiesByPartition": [{
"partitionName": "",
- "capacity": 50,
+ "capacity": 0,
"usedCapacity": 0,
"maxCapacity": 100,
- "absoluteCapacity": 50,
+ "absoluteCapacity": 0,
"absoluteUsedCapacity": 0,
"absoluteMaxCapacity": 100,
"maxAMLimitPercentage": 10,
@@ -138,8 +139,8 @@
]}
},
"effectiveMaxResource": {
- "memory": 0,
- "vCores": 0,
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -148,7 +149,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -157,7 +158,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
}
@@ -261,8 +262,8 @@
]}
},
"amLimit": {
- "memory": 0,
- "vCores": 0,
+ "memory": 839680,
+ "vCores": 1,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -271,7 +272,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 839680
},
{
"attributes": {},
@@ -280,7 +281,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 1
}
]}
},
@@ -334,8 +335,8 @@
]}
},
"maxEffectiveCapacity": {
- "memory": 0,
- "vCores": 0,
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -344,7 +345,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -353,7 +354,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
},
@@ -409,15 +410,15 @@
"numActiveApplications": 0,
"numPendingApplications": 0,
"numContainers": 0,
- "maxApplications": 5000,
- "maxApplicationsPerUser": 5000,
+ "maxApplications": 0,
+ "maxApplicationsPerUser": 0,
"userLimit": 100,
"users": {},
"userLimitFactor": 1,
"configuredMaxAMResourceLimit": 0.1,
"AMResourceLimit": {
- "memory": 0,
- "vCores": 0,
+ "memory": 839680,
+ "vCores": 1,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -426,7 +427,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 839680
},
{
"attributes": {},
@@ -435,7 +436,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 1
}
]}
},
@@ -464,8 +465,8 @@
]}
},
"userAMResourceLimit": {
- "memory": 0,
- "vCores": 0,
+ "memory": 839680,
+ "vCores": 1,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -474,7 +475,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 839680
},
{
"attributes": {},
@@ -483,7 +484,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 1
}
]}
},
@@ -495,110 +496,37 @@
"defaultApplicationLifetime": -1
},
{
- "type": "capacitySchedulerLeafQueueInfo",
- "queuePath": "root.default",
- "capacity": 0,
+ "queuePath": "root.managed",
+ "capacity": 0.048828125,
"usedCapacity": 0,
"maxCapacity": 100,
- "absoluteCapacity": 0,
+ "absoluteCapacity": 0.048828125,
"absoluteMaxCapacity": 100,
"absoluteUsedCapacity": 0,
"weight": -1,
"normalizedWeight": 0,
"numApplications": 0,
"maxParallelApps": 2147483647,
- "queueName": "default",
- "isAbsoluteResource": false,
+ "queueName": "managed",
+ "isAbsoluteResource": true,
"state": "RUNNING",
- "resourcesUsed": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "hideReservationQueues": false,
- "nodeLabels": ["*"],
- "allocatedContainers": 0,
- "reservedContainers": 0,
- "pendingContainers": 0,
- "capacities": {"queueCapacitiesByPartition": [{
- "partitionName": "",
- "capacity": 0,
+ "queues": {"queue": [{
+ "type": "capacitySchedulerLeafQueueInfo",
+ "queuePath": "root.managed.queue1",
+ "capacity": 50,
"usedCapacity": 0,
"maxCapacity": 100,
- "absoluteCapacity": 0,
- "absoluteUsedCapacity": 0,
+ "absoluteCapacity": 0.024414062,
"absoluteMaxCapacity": 100,
- "maxAMLimitPercentage": 10,
+ "absoluteUsedCapacity": 0,
"weight": -1,
"normalizedWeight": 0,
- "configuredMinResource": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 8192,
- "minimumAllocation": 1024,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 4,
- "minimumAllocation": 1,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "configuredMaxResource": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 8192,
- "minimumAllocation": 1024,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 4,
- "minimumAllocation": 1,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "effectiveMinResource": {
+ "numApplications": 0,
+ "maxParallelApps": 2147483647,
+ "queueName": "queue1",
+ "isAbsoluteResource": true,
+ "state": "RUNNING",
+ "resourcesUsed": {
"memory": 0,
"vCores": 0,
"resourceInformations": {"resourceInformation": [
@@ -622,36 +550,269 @@
}
]}
},
- "effectiveMaxResource": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- }
- }]},
- "resources": {"resourceUsagesByPartition": [{
- "partitionName": "",
- "used": {
- "memory": 0,
- "vCores": 0,
+ "hideReservationQueues": false,
+ "nodeLabels": ["*"],
+ "allocatedContainers": 0,
+ "reservedContainers": 0,
+ "pendingContainers": 0,
+ "capacities": {"queueCapacitiesByPartition": [{
+ "partitionName": "",
+ "capacity": 50,
+ "usedCapacity": 0,
+ "maxCapacity": 100,
+ "absoluteCapacity": 0.024414062,
+ "absoluteUsedCapacity": 0,
+ "absoluteMaxCapacity": 100,
+ "maxAMLimitPercentage": 10,
+ "weight": -1,
+ "normalizedWeight": 0,
+ "configuredMinResource": {
+ "memory": 2048,
+ "vCores": 2,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 2048
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 2
+ }
+ ]}
+ },
+ "configuredMaxResource": {
+ "memory": 0,
+ "vCores": 0,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 8192,
+ "minimumAllocation": 1024,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 0
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 4,
+ "minimumAllocation": 1,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 0
+ }
+ ]}
+ },
+ "effectiveMinResource": {
+ "memory": 2048,
+ "vCores": 2,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 2048
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 2
+ }
+ ]}
+ },
+ "effectiveMaxResource": {
+ "memory": 8388608,
+ "vCores": 8192,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 8388608
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 8192
+ }
+ ]}
+ }
+ }]},
+ "resources": {"resourceUsagesByPartition": [{
+ "partitionName": "",
+ "used": {
+ "memory": 0,
+ "vCores": 0,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 0
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 0
+ }
+ ]}
+ },
+ "reserved": {
+ "memory": 0,
+ "vCores": 0,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 0
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 0
+ }
+ ]}
+ },
+ "pending": {
+ "memory": 0,
+ "vCores": 0,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 0
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 0
+ }
+ ]}
+ },
+ "amUsed": {
+ "memory": 0,
+ "vCores": 0,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 0
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 0
+ }
+ ]}
+ },
+ "amLimit": {
+ "memory": 839680,
+ "vCores": 1,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 839680
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 1
+ }
+ ]}
+ },
+ "userAmLimit": {
+ "memory": 0,
+ "vCores": 0,
+ "resourceInformations": {"resourceInformation": [
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "memory-mb",
+ "resourceType": "COUNTABLE",
+ "units": "Mi",
+ "value": 0
+ },
+ {
+ "attributes": {},
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
+ "name": "vcores",
+ "resourceType": "COUNTABLE",
+ "units": "",
+ "value": 0
+ }
+ ]}
+ }
+ }]},
+ "minEffectiveCapacity": {
+ "memory": 2048,
+ "vCores": 2,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -660,7 +821,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 2048
},
{
"attributes": {},
@@ -669,13 +830,13 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 2
}
]}
},
- "reserved": {
- "memory": 0,
- "vCores": 0,
+ "maxEffectiveCapacity": {
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -684,7 +845,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -693,13 +854,13 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
},
- "pending": {
- "memory": 0,
- "vCores": 0,
+ "maximumAllocation": {
+ "memory": 8192,
+ "vCores": 4,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -708,7 +869,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8192
},
{
"attributes": {},
@@ -717,13 +878,47 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 4
}
]}
},
- "amUsed": {
- "memory": 0,
- "vCores": 0,
+ "queueAcls": {"queueAcl": [
+ {
+ "accessType": "ADMINISTER_QUEUE",
+ "accessControlList": " "
+ },
+ {
+ "accessType": "APPLICATION_MAX_PRIORITY",
+ "accessControlList": "*"
+ },
+ {
+ "accessType": "SUBMIT_APP",
+ "accessControlList": " "
+ }
+ ]},
+ "queuePriority": 0,
+ "orderingPolicyInfo": "fifo",
+ "autoCreateChildQueueEnabled": false,
+ "leafQueueTemplate": {},
+ "mode": "absolute",
+ "queueType": "leaf",
+ "creationMethod": "dynamicLegacy",
+ "autoCreationEligibility": "off",
+ "autoQueueTemplateProperties": {},
+ "autoQueueParentTemplateProperties": {},
+ "autoQueueLeafTemplateProperties": {},
+ "numActiveApplications": 0,
+ "numPendingApplications": 0,
+ "numContainers": 0,
+ "maxApplications": 2,
+ "maxApplicationsPerUser": 2,
+ "userLimit": 100,
+ "users": {},
+ "userLimitFactor": 1,
+ "configuredMaxAMResourceLimit": 0.1,
+ "AMResourceLimit": {
+ "memory": 839680,
+ "vCores": 1,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -732,7 +927,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 839680
},
{
"attributes": {},
@@ -741,11 +936,11 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 1
}
]}
},
- "amLimit": {
+ "usedAMResource": {
"memory": 0,
"vCores": 0,
"resourceInformations": {"resourceInformation": [
@@ -769,9 +964,9 @@
}
]}
},
- "userAmLimit": {
- "memory": 0,
- "vCores": 0,
+ "userAMResourceLimit": {
+ "memory": 839680,
+ "vCores": 1,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -780,7 +975,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 839680
},
{
"attributes": {},
@@ -789,212 +984,17 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 1
}
]}
- }
- }]},
- "minEffectiveCapacity": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "maxEffectiveCapacity": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "maximumAllocation": {
- "memory": 8192,
- "vCores": 4,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 8192
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 4
- }
- ]}
- },
- "queueAcls": {"queueAcl": [
- {
- "accessType": "ADMINISTER_QUEUE",
- "accessControlList": " "
- },
- {
- "accessType": "APPLICATION_MAX_PRIORITY",
- "accessControlList": "*"
},
- {
- "accessType": "SUBMIT_APP",
- "accessControlList": " "
- }
- ]},
- "queuePriority": 0,
- "orderingPolicyInfo": "fifo",
- "autoCreateChildQueueEnabled": false,
- "leafQueueTemplate": {},
- "mode": "percentage",
- "queueType": "leaf",
- "creationMethod": "static",
- "autoCreationEligibility": "off",
- "autoQueueTemplateProperties": {},
- "autoQueueParentTemplateProperties": {},
- "autoQueueLeafTemplateProperties": {},
- "numActiveApplications": 0,
- "numPendingApplications": 0,
- "numContainers": 0,
- "maxApplications": 0,
- "maxApplicationsPerUser": 0,
- "userLimit": 100,
- "users": {},
- "userLimitFactor": 1,
- "configuredMaxAMResourceLimit": 0.1,
- "AMResourceLimit": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "usedAMResource": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "userAMResourceLimit": {
- "memory": 0,
- "vCores": 0,
- "resourceInformations": {"resourceInformation": [
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "memory-mb",
- "resourceType": "COUNTABLE",
- "units": "Mi",
- "value": 0
- },
- {
- "attributes": {},
- "maximumAllocation": 9223372036854775807,
- "minimumAllocation": 0,
- "name": "vcores",
- "resourceType": "COUNTABLE",
- "units": "",
- "value": 0
- }
- ]}
- },
- "preemptionDisabled": true,
- "intraQueuePreemptionDisabled": true,
- "defaultPriority": 0,
- "isAutoCreatedLeafQueue": false,
- "maxApplicationLifetime": -1,
- "defaultApplicationLifetime": -1
- },
- {
- "queuePath": "root.managedtest2",
- "capacity": 50,
- "usedCapacity": 0,
- "maxCapacity": 100,
- "absoluteCapacity": 50,
- "absoluteMaxCapacity": 100,
- "absoluteUsedCapacity": 0,
- "weight": -1,
- "normalizedWeight": 0,
- "numApplications": 0,
- "maxParallelApps": 2147483647,
- "queueName": "managedtest2",
- "isAbsoluteResource": false,
- "state": "RUNNING",
- "queues": {},
+ "preemptionDisabled": true,
+ "intraQueuePreemptionDisabled": true,
+ "defaultPriority": 0,
+ "isAutoCreatedLeafQueue": true,
+ "maxApplicationLifetime": -1,
+ "defaultApplicationLifetime": -1
+ }]},
"resourcesUsed": {
"memory": 0,
"vCores": 0,
@@ -1026,36 +1026,36 @@
"pendingContainers": 0,
"capacities": {"queueCapacitiesByPartition": [{
"partitionName": "",
- "capacity": 50,
+ "capacity": 0.048828125,
"usedCapacity": 0,
"maxCapacity": 100,
- "absoluteCapacity": 50,
+ "absoluteCapacity": 0.048828125,
"absoluteUsedCapacity": 0,
"absoluteMaxCapacity": 100,
"maxAMLimitPercentage": 0,
"weight": -1,
"normalizedWeight": 0,
"configuredMinResource": {
- "memory": 0,
- "vCores": 0,
+ "memory": 4096,
+ "vCores": 4,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
- "maximumAllocation": 8192,
- "minimumAllocation": 1024,
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 4096
},
{
"attributes": {},
- "maximumAllocation": 4,
- "minimumAllocation": 1,
+ "maximumAllocation": 9223372036854775807,
+ "minimumAllocation": 0,
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 4
}
]}
},
@@ -1084,8 +1084,8 @@
]}
},
"effectiveMinResource": {
- "memory": 0,
- "vCores": 0,
+ "memory": 4096,
+ "vCores": 4,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -1094,7 +1094,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 4096
},
{
"attributes": {},
@@ -1103,13 +1103,13 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 4
}
]}
},
"effectiveMaxResource": {
- "memory": 0,
- "vCores": 0,
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -1118,7 +1118,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -1127,7 +1127,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
}
@@ -1208,8 +1208,8 @@
}
}]},
"minEffectiveCapacity": {
- "memory": 0,
- "vCores": 0,
+ "memory": 4096,
+ "vCores": 4,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -1218,7 +1218,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 4096
},
{
"attributes": {},
@@ -1227,13 +1227,13 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 4
}
]}
},
"maxEffectiveCapacity": {
- "memory": 0,
- "vCores": 0,
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -1242,7 +1242,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -1251,7 +1251,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
},
@@ -1296,8 +1296,11 @@
"queuePriority": 0,
"orderingPolicyInfo": "utilization",
"autoCreateChildQueueEnabled": true,
- "leafQueueTemplate": {},
- "mode": "percentage",
+ "leafQueueTemplate": {"property": [{
+ "name": "leaf-queue-template.capacity",
+ "value": "[memory=2048,vcores=2]"
+ }]},
+ "mode": "absolute",
"queueType": "parent",
"creationMethod": "static",
"autoCreationEligibility": "legacy",
@@ -1366,8 +1369,8 @@
]}
},
"effectiveMinResource": {
- "memory": 0,
- "vCores": 0,
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -1376,7 +1379,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -1385,13 +1388,13 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
},
"effectiveMaxResource": {
- "memory": 0,
- "vCores": 0,
+ "memory": 8388608,
+ "vCores": 8192,
"resourceInformations": {"resourceInformation": [
{
"attributes": {},
@@ -1400,7 +1403,7 @@
"name": "memory-mb",
"resourceType": "COUNTABLE",
"units": "Mi",
- "value": 0
+ "value": 8388608
},
{
"attributes": {},
@@ -1409,7 +1412,7 @@
"name": "vcores",
"resourceType": "COUNTABLE",
"units": "",
- "value": 0
+ "value": 8192
}
]}
}
@@ -1576,4 +1579,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml
index ac51fcf..48b6893 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml
@@ -8,6 +8,7 @@
<queueName>root</queueName>
<queuePath>root</queuePath>
<maxParallelApps>2147483647</maxParallelApps>
+ <isAbsoluteResource>false</isAbsoluteResource>
<queues>
<queue>
<queuePath>root.a</queuePath>
@@ -4546,4 +4547,4 @@
<autoQueueParentTemplateProperties/>
<autoQueueLeafTemplateProperties/>
</schedulerInfo>
-</scheduler>
\ No newline at end of file
+</scheduler>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json
index bbf127f..7960bf7 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"queuePath": "root.a",
@@ -4953,4 +4954,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml
index 0e4d152..97d937b 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml
@@ -8,6 +8,7 @@
<queueName>root</queueName>
<queuePath>root</queuePath>
<maxParallelApps>2147483647</maxParallelApps>
+ <isAbsoluteResource>false</isAbsoluteResource>
<queues>
<queue>
<queuePath>root.a</queuePath>
@@ -4992,4 +4993,4 @@
<autoQueueParentTemplateProperties/>
<autoQueueLeafTemplateProperties/>
</schedulerInfo>
-</scheduler>
\ No newline at end of file
+</scheduler>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageMode.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageMode.json
index 71fe8e9..cb3441a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageMode.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageMode.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
@@ -1735,4 +1736,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
index 3abe605..8fed362 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
@@ -1576,4 +1577,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightMode.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightMode.json
index bb230a7..b1894c58 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightMode.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightMode.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
@@ -1735,4 +1736,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-After.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-After.json
index 9ab65fb..188b72a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-After.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-After.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
@@ -4003,4 +4004,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-Before.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-Before.json
index a2b6acf..ee4cd14 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-Before.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-WeightModeWithAutoCreatedQueues-Before.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"type": "capacitySchedulerLeafQueueInfo",
@@ -1735,4 +1736,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json
index eed784a..26289cc 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json
@@ -8,6 +8,7 @@
"queueName": "root",
"queuePath": "root",
"maxParallelApps": 2147483647,
+ "isAbsoluteResource": false,
"queues": {"queue": [
{
"queuePath": "root.a",
@@ -4500,4 +4501,4 @@
"autoQueueTemplateProperties": {},
"autoQueueParentTemplateProperties": {},
"autoQueueLeafTemplateProperties": {}
-}}}
\ No newline at end of file
+}}}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml
index 5c0a3de..d196ec8 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml
@@ -8,6 +8,7 @@
<queueName>root</queueName>
<queuePath>root</queuePath>
<maxParallelApps>2147483647</maxParallelApps>
+ <isAbsoluteResource>false</isAbsoluteResource>
<queues>
<queue>
<queuePath>root.a</queuePath>
@@ -4535,4 +4536,4 @@
<autoQueueParentTemplateProperties/>
<autoQueueLeafTemplateProperties/>
</schedulerInfo>
-</scheduler>
\ No newline at end of file
+</scheduler>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
