Repository: hadoop Updated Branches: refs/heads/trunk c36b4aa31 -> cc683952d
YARN-7675. [UI2] Support loading pre-2.8 version /scheduler REST response for queue page. Contributed by Gergely Novák. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc683952 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc683952 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc683952 Branch: refs/heads/trunk Commit: cc683952d2c1730109497aa78dd53629e914d294 Parents: c36b4aa Author: Sunil G <sun...@apache.org> Authored: Fri Feb 23 16:10:29 2018 +0530 Committer: Sunil G <sun...@apache.org> Committed: Fri Feb 23 16:10:29 2018 +0530 ---------------------------------------------------------------------- .../serializers/yarn-queue/capacity-queue.js | 29 ++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc683952/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js index b171c6e..e838255 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js @@ -54,6 +54,28 @@ export default DS.JSONAPISerializer.extend({ }); } + var partitions = []; + var partitionMap = {}; + if ("capacities" in payload) { + partitions = payload.capacities.queueCapacitiesByPartition.map( + cap => cap.partitionName || PARTITION_LABEL); + partitionMap = payload.capacities.queueCapacitiesByPartition.reduce((init, cap) => { + init[cap.partitionName || PARTITION_LABEL] = cap; + return init; + }, {}); + } else { + partitions = [PARTITION_LABEL]; + partitionMap[PARTITION_LABEL] = { + partitionName: "", + capacity: payload.capacity, + maxCapacity: payload.maxCapacity, + usedCapacity: payload.usedCapacity, + absoluteCapacity: 'absoluteCapacity' in payload ? payload.absoluteCapacity : payload.capacity, + absoluteMaxCapacity: 'absoluteMaxCapacity' in payload ? payload.absoluteMaxCapacity : payload.maxCapacity, + absoluteUsedCapacity: 'absoluteUsedCapacity' in payload ? payload.absoluteUsedCapacity : payload.usedCapacity, + }; + } + var fixedPayload = { id: id, type: primaryModelClass.modelName, // yarn-queue @@ -74,11 +96,8 @@ export default DS.JSONAPISerializer.extend({ numPendingApplications: payload.numPendingApplications, numActiveApplications: payload.numActiveApplications, resources: payload.resources, - partitions: payload.capacities.queueCapacitiesByPartition.map(cap => cap.partitionName || PARTITION_LABEL), - partitionMap: payload.capacities.queueCapacitiesByPartition.reduce((init, cap) => { - init[cap.partitionName || PARTITION_LABEL] = cap; - return init; - }, {}), + partitions: partitions, + partitionMap: partitionMap, type: "capacity", }, // Relationships --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org