From 886b40fe94bf5fab389d52270177f8b72f9d32cd Mon Sep 17 00:00:00 2001 From: Sunil G Date: Thu, 2 Nov 2017 11:39:16 +0530 Subject: [PATCH] YARN-7364 --- .../hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js | 5 ++++- .../hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js index 3c6abd4cfda..d03ea0daa2d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js @@ -28,7 +28,10 @@ export default AbstractRoute.extend({ { state: "RUNNING" }), - queues: this.store.query('yarn-queue.yarn-queue', {}), + queues: this.store.query("yarn-queue.yarn-queue", {}).then((model) => { + let type = model.get('firstObject').get('type'); + return this.store.query("yarn-queue." + type + "-queue", {}); + }), }); }, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js index e36de4be493..896d448960c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js @@ -22,6 +22,6 @@ export default { }, getQueueLink: function(queueName) { - return '#/yarn-queue/' + queueName; + return '#/yarn-queue/' + queueName + '/info'; } }; -- 2.13.5 (Apple Git-94)