Repository: hadoop Updated Branches: refs/heads/branch-2.8 53ec7c924 -> 0d734cea4
YARN-4760. proxy redirect to history server uses wrong URL. Contributed by Eric Badger (cherry picked from commit 4163e36c2be2f562545aba93c1d47643a9ff4741) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0d734cea Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0d734cea Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0d734cea Branch: refs/heads/branch-2.8 Commit: 0d734cea44a4e197babe62dbd5e1e20ee1aeb201 Parents: 53ec7c9 Author: Jason Lowe <jl...@apache.org> Authored: Mon Mar 7 15:56:33 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Mon Mar 7 15:58:01 2016 +0000 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java | 2 +- .../apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d734cea/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java index 0e988b8..ab4b295 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java @@ -130,7 +130,7 @@ public class WebAppProxyServlet extends HttpServlet { WebAppUtils.getResolvedRMWebAppURLWithScheme(conf), "cluster", "app"); this.ahsAppPageUrlBase = StringHelper.pjoin( WebAppUtils.getHttpSchemePrefix(conf) + WebAppUtils - .getAHSWebAppURLWithoutScheme(conf), "applicationhistory", "apps"); + .getAHSWebAppURLWithoutScheme(conf), "applicationhistory", "app"); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d734cea/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java index 68d1258..330e4de 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java @@ -275,7 +275,7 @@ public class TestWebAppProxyServlet { } String appAddressInAhs = WebAppUtils.getHttpSchemePrefix(configuration) + WebAppUtils.getAHSWebAppURLWithoutScheme(configuration) + - "/applicationhistory" + "/apps/" + app.toString(); + "/applicationhistory" + "/app/" + app.toString(); assertTrue("Webapp proxy servlet should have redirected to AHS", proxyConn.getURL().toString().equals(appAddressInAhs)); }
