Repository: hadoop Updated Branches: refs/heads/branch-3.1 f358a7761 -> e4eac4a9f
YARN-8396. Click on an individual container continuously spins and doesn't load the page. Contributed by Sunil Govindan. (cherry picked from commit 745f3a244166c1e6a1aee81eb1d6c2c692053d04) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e4eac4a9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e4eac4a9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e4eac4a9 Branch: refs/heads/branch-3.1 Commit: e4eac4a9f30501b8774c6d375f76dfc7496b8349 Parents: f358a77 Author: Rohith Sharma K S <[email protected]> Authored: Tue Jun 5 19:28:24 2018 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Tue Jun 5 19:29:04 2018 +0530 ---------------------------------------------------------------------- .../src/main/webapp/app/routes/yarn-node-container.js | 2 +- .../src/main/webapp/app/templates/yarn-container-log.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4eac4a9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js index 0f1e4cd..388918e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js @@ -26,7 +26,7 @@ export default AbstractRoute.extend({ return Ember.RSVP.hash({ nodeContainer: this.store.queryRecord('yarn-node-container', { nodeHttpAddr: param.node_addr, containerId: param.container_id }), - nmGpuInfo: this.store.findRecord('yarn-nm-gpu', address, {reload:true}), + nmGpuInfo: this.store.findRecord('yarn-nm-gpu', param.node_addr, {reload:true}), nodeInfo: { id: param.node_id, addr: param.node_addr, containerId: param.container_id } }); }, http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4eac4a9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs index 67629d2..6376caa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs @@ -19,7 +19,7 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} <div class="col-md-12 container-fluid"> - {{node-menu path="yarn-container-log" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} + {{node-menu-panel path="yarn-container-log" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} <div class="col-md-10"> <div class="panel panel-default"> <div class="panel-heading"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
