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 2017/11/02 17:30:36 UTC
[45/50] [abbrv] hadoop git commit: YARN-7364. Queue dash board in new
YARN UI has incorrect values. (Sunil G via wangda)
YARN-7364. Queue dash board in new YARN UI has incorrect values. (Sunil G via wangda)
Change-Id: Ia5336f407147d2985a61b5f9f1e69b5b35f398a4
(cherry picked from commit 752f000e0f521ca7be173d6ca338da4585284fd0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/04c604cf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04c604cf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04c604cf
Branch: refs/heads/YARN-1011
Commit: 04c604cf1d4e2c52b01a224e9d4a9888a3d8c740
Parents: d00b6f7
Author: Wangda Tan <wa...@apache.org>
Authored: Thu Nov 2 09:50:00 2017 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Thu Nov 2 09:51:28 2017 -0700
----------------------------------------------------------------------
.../src/main/webapp/app/routes/cluster-overview.js | 5 ++++-
.../src/main/webapp/app/utils/href-address-utils.js | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04c604cf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
----------------------------------------------------------------------
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 3c6abd4..d03ea0d 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", {});
+ }),
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04c604cf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
----------------------------------------------------------------------
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 e36de4b..896d448 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';
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org