YARN-6258. localBaseAddress for CORS proxy configuration is not working when suffixed with forward slash in new YARN UI. 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/72eb9fd0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72eb9fd0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72eb9fd0 Branch: refs/heads/YARN-5355_branch2 Commit: 72eb9fd0ca60a954c1f641fc0be5fe8786e91266 Parents: 9c1cc96 Author: Sunil G <sun...@apache.org> Authored: Fri Apr 7 11:42:50 2017 +0530 Committer: vrushali <vrush...@apache.org> Committed: Tue Oct 17 11:39:57 2017 -0700 ---------------------------------------------------------------------- .../hadoop-yarn-ui/src/main/webapp/app/services/hosts.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/72eb9fd0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js index 19863e1..807844e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js @@ -61,7 +61,11 @@ export default Ember.Service.extend({ }, localBaseAddress: Ember.computed(function () { - return this.localAddress(); + var url = this.localAddress(); + if (url.endsWith('/')) { + url = url.slice(0, -1); + } + return url; }), timelineWebAddress: Ember.computed(function () { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
