From common-commits-return-79127-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon Feb 26 23:31:32 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B2F4C18067A for ; Mon, 26 Feb 2018 23:31:31 +0100 (CET) Received: (qmail 40604 invoked by uid 500); 26 Feb 2018 22:31:14 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 38279 invoked by uid 99); 26 Feb 2018 22:31:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Feb 2018 22:31:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD88DF4E32; Mon, 26 Feb 2018 22:31:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: xyao@apache.org To: common-commits@hadoop.apache.org Date: Mon, 26 Feb 2018 22:31:55 -0000 Message-Id: In-Reply-To: <0797e7f661a14ace8216e67b240c8b52@git.apache.org> References: <0797e7f661a14ace8216e67b240c8b52@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B46/59=5D_=5Babbrv=5D_hadoop_git_commit=3A_YARN-7675?= =?utf-8?q?=2E_=5BUI2=5D_Support_loading_pre-2=2E8_version_/scheduler_REST_r?= =?utf-8?q?esponse_for_queue_page=2E_Contributed_by_Gergely_Nov=C3=A1k=2E?= 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-7240 Commit: cc683952d2c1730109497aa78dd53629e914d294 Parents: c36b4aa Author: Sunil G Authored: Fri Feb 23 16:10:29 2018 +0530 Committer: Sunil G 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