You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2018/02/23 19:45:28 UTC
[47/50] [abbrv] hadoop git commit: YARN-7675. [UI2] Support loading pre-2.8 version /scheduler REST response for queue page. Contributed by Gergely Novák.
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/HDFS-12996
Commit: cc683952d2c1730109497aa78dd53629e914d294
Parents: c36b4aa
Author: Sunil G <su...@apache.org>
Authored: Fri Feb 23 16:10:29 2018 +0530
Committer: Sunil G <su...@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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org