diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md index 7c1f418865170a62070b242072682a10e3efa83e..c1356b1b2c13f5c8662eb32e1e4653009c7de573 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md @@ -998,7 +998,7 @@ Response Body: | type | string | Scheduler type - fairScheduler | | rootQueue | The root queue object | A collection of root queue resources | -### Elements of the root queue object +### Elements of all queue objects | Item | Data Type | Description | |:---- |:---- |:---- | @@ -1010,17 +1010,23 @@ Response Body: | clusterResources | A single resource object | The capacity of the cluster | | queueName | string | The name of the queue | | schedulingPolicy | string | The name of the scheduling policy used by the queue | -| childQueues | array of queues(JSON)/queue objects(XML) | A collection of sub-queue information. Omitted if the queue has no childQueues. | +| childQueues | array of queues(JSON)/queue objects(XML) | A collection of sub-queue information. Omitted if the queue has no childQueues or is a leaf queue. | +| allocatedContainers | int | The number of allocated containers | +| demandResources | A single resource object | The resources that need to be allocated to this queue | +| pendingContainers | int | The number of pending containers | +| preemptable | boolean | true if containers in this queue can be preempted | +| reservedContainers | int | The number of reserved containers | +| steadyFairResources | A single resource object | The steady fair share for the queue | -### Elements of the queues object for a Leaf queue - contains all the elements in parent except 'childQueues' plus the following +### Additional elements of leaf queue objects (with the exception of the 'childQueues' property) | Item | Data Type | Description | |:---- |:---- |:---- | -| type | string | type of the queue - fairSchedulerLeafQueueInfo | +| type | string | The type of the queue - fairSchedulerLeafQueueInfo | | numActiveApps | int | The number of active applications in this queue | | numPendingApps | int | The number of pending applications in this queue | -### Elements of the resource object for resourcesUsed in queues +### Elements of the (cluster/demand/fair/max/min/used/*)Resources object in queues | Item | Data Type | Description | |:---- |:---- |:---- | @@ -1049,13 +1055,19 @@ Response Body: "scheduler": { "schedulerInfo": { "rootQueue": { + "allocatedContainers": 0, "childQueues": { "queue": [ { + "allocatedContainers": 0, "clusterResources": { "memory": 8192, "vCores": 8 }, + "demandResources": { + "memory": 0, + "vCores": 0 + }, "fairResources": { "memory": 0, "vCores": 0 @@ -1071,8 +1083,15 @@ Response Body: }, "numActiveApps": 0, "numPendingApps": 0, + "pendingContainers": 0, + "preemptable": true, "queueName": "root.default", + "reservedContainers": 0, "schedulingPolicy": "fair", + "steadyFairResources": { + "memory": 4096, + "vCores": 0 + }, "type": "fairSchedulerLeafQueueInfo", "usedResources": { "memory": 0, @@ -1080,12 +1099,18 @@ Response Body: } }, { + "allocatedContainers": 0, "childQueues": { "queue": [ { + "allocatedContainers": 0, "clusterResources": { "memory": 8192, - "vCores": 8 + "vCores": 8 + }, + "demandResources": { + "memory": 0, + "vCores": 0 }, "fairResources": { "memory": 10000, @@ -1102,8 +1127,15 @@ Response Body: }, "numActiveApps": 0, "numPendingApps": 0, + "pendingContainers": 0, + "preemptable": true, "queueName": "root.sample_queue.sample_sub_queue", + "reservedContainers": 0, "schedulingPolicy": "fair", + "steadyFairResources": { + "memory": 4096, + "vCores": 0 + }, "type": "fairSchedulerLeafQueueInfo", "usedResources": { "memory": 0, @@ -1116,6 +1148,10 @@ Response Body: "memory": 8192, "vCores": 8 }, + "demandResources": { + "memory": 0, + "vCores": 0 + }, "fairResources": { "memory": 10000, "vCores": 0 @@ -1129,19 +1165,30 @@ Response Body: "memory": 10000, "vCores": 0 }, + "pendingContainers": 0, + "preemptable": true, "queueName": "root.sample_queue", + "reservedContainers": 0, "schedulingPolicy": "fair", + "steadyFairResources": { + "memory": 4096, + "vCores": 0 + }, "usedResources": { "memory": 0, "vCores": 0 } } - ], + ] }, "clusterResources": { "memory": 8192, "vCores": 8 }, + "demandResources": { + "memory": 0, + "vCores": 0 + }, "fairResources": { "memory": 8192, "vCores": 8 @@ -1155,8 +1202,15 @@ Response Body: "memory": 0, "vCores": 0 }, + "pendingContainers": 0, + "preemptable": true, "queueName": "root", + "reservedContainers": 0, "schedulingPolicy": "fair", + "steadyFairResources": { + "memory": 8192, + "vCores": 8 + }, "usedResources": { "memory": 0, "vCores": 0 @@ -1202,6 +1256,14 @@ Response Body: 0 0 + + 0 + 0 + + + 8192 + 8 + 8192 8 @@ -1210,8 +1272,12 @@ Response Body: 8192 8 + 0 + 0 + 0 root fair + true 2147483647 @@ -1227,6 +1293,14 @@ Response Body: 0 0 + + 0 + 0 + + + 4096 + 0 + 0 0 @@ -1235,15 +1309,19 @@ Response Body: 8192 8 + 0 + 0 + 0 root.default fair + true 0 0 50 - 10000 + 0 0 @@ -1254,6 +1332,14 @@ Response Body: 0 0 + + 0 + 0 + + + 4096 + 0 + 10000 0 @@ -1262,8 +1348,12 @@ Response Body: 8192 8 + 0 + 0 + 0 root.sample_queue fair + true 2147483647 @@ -1279,6 +1369,14 @@ Response Body: 0 0 + + 0 + 0 + + + 4096 + 0 + 10000 0 @@ -1287,8 +1385,12 @@ Response Body: 8192 8 + 0 + 0 + 0 root.sample_queue.sample_sub_queue fair + true 0 0