hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jl...@apache.org
Subject hadoop git commit: YARN-4760. proxy redirect to history server uses wrong URL. Contributed by Eric Badger (cherry picked from commit 4163e36c2be2f562545aba93c1d47643a9ff4741)
Date Mon, 07 Mar 2016 16:00:04 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 274e18286 -> 63b2019ab


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/63b2019a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63b2019a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63b2019a

Branch: refs/heads/branch-2.7
Commit: 63b2019ab4de9db375baacccaf6b4bcf3074d14c
Parents: 274e182
Author: Jason Lowe <jlowe@apache.org>
Authored: Mon Mar 7 15:59:45 2016 +0000
Committer: Jason Lowe <jlowe@apache.org>
Committed: Mon Mar 7 15:59:45 2016 +0000

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                   | 3 +++
 .../apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java    | 2 +-
 .../hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/63b2019a/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ede98ef..f001675 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -104,6 +104,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4723. NodesListManager$UnknownNodeId ClassCastException (Kuhu Shukla
     via jlowe)
 
+    YARN-4760. proxy redirect to history server uses wrong URL (Eric Badger
+    via jlowe)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/63b2019a/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 7f89b92..9296251 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
@@ -112,7 +112,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/63b2019a/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 bccd6f9..a6d83c8 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
@@ -249,7 +249,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));
     }


Mime
View raw message