big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6789. Fix TestAMWebApp failure. Contributed by Daniel Templeton.

Browse Source
This commit is contained in:
Akira Ajisaka 2016-10-06 15:57:15 +09:00
parent 202325485d
commit 272a21747e
2 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java
View File

@ -247,9 +247,11 @@ protected ClientService createClientService(AppContext context) {
HttpURLConnection conn = (HttpURLConnection) httpUrl.openConnection();
conn.setInstanceFollowRedirects(false);
conn.connect();
String expectedURL =
scheme + conf.get(YarnConfiguration.PROXY_ADDRESS)
+ ProxyUriUtils.getPath(app.getAppID(), "/mapreduce");
// Because we're not calling from the proxy's address, we'll be redirected
String expectedURL = scheme + conf.get(YarnConfiguration.PROXY_ADDRESS)
+ ProxyUriUtils.getPath(app.getAppID(), "/mapreduce", true);
Assert.assertEquals(expectedURL,
conn.getHeaderField(HttpHeaders.LOCATION));
Assert.assertEquals(HttpStatus.SC_MOVED_TEMPORARILY,

57
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java
View File

@ -40,6 +40,8 @@ public class ProxyUriUtils {
public static final String PROXY_SERVLET_NAME = "proxy";
/**Base path where the proxy servlet will handle requests.*/
public static final String PROXY_BASE = "/proxy/";
/**Path component added when the proxy redirects the connection.*/
public static final String REDIRECT = "redirect/";
/**Path Specification for the proxy servlet.*/
public static final String PROXY_PATH_SPEC = PROXY_BASE+"*";
/**Query Parameter indicating that the URI was approved.*/
@ -57,27 +59,58 @@ private static String uriEncode(Object o) {
/**
* Get the proxied path for an application.
* @param id the application id to use.
* @return the base path to that application through the proxy.
*
* @param id the application id to use
* @return the base path to that application through the proxy
*/
public static String getPath(ApplicationId id) {
if(id == null) {
throw new IllegalArgumentException("Application id cannot be null ");
}
return ujoin(PROXY_BASE, uriEncode(id));
return getPath(id, false);
}
/**
* Get the proxied path for an application.
* @param id the application id to use.
* @param path the rest of the path to the application.
* @return the base path to that application through the proxy.
*
* @param id the application id to use
* @param redirected whether the path should contain the redirect component
* @return the base path to that application through the proxy
*/
public static String getPath(ApplicationId id, boolean redirected) {
if (id == null) {
throw new IllegalArgumentException("Application id cannot be null ");
}
if (redirected) {
return ujoin(PROXY_BASE, REDIRECT, uriEncode(id));
} else {
return ujoin(PROXY_BASE, uriEncode(id));
}
}
/**
* Get the proxied path for an application.
*
* @param id the application id to use
* @param path the rest of the path to the application
* @return the base path to that application through the proxy
*/
public static String getPath(ApplicationId id, String path) {
if(path == null) {
return getPath(id);
return getPath(id, path, false);
}
/**
* Get the proxied path for an application.
*
* @param id the application id to use
* @param path the rest of the path to the application
* @param redirected whether the path should contain the redirect component
* @return the base path to that application through the proxy
*/
public static String getPath(ApplicationId id, String path,
boolean redirected) {
if (path == null) {
return getPath(id, redirected);
} else {
return ujoin(getPath(id), path);
return ujoin(getPath(id, redirected), path);
}
}