diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java index a56d2a4..d2ce2f2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java @@ -23,8 +23,10 @@ import java.io.IOException; import java.net.ConnectException; import java.net.URL; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServlet; @@ -167,18 +169,23 @@ public void setup() { webapp.setWebServices(wsName); String basePath = "/" + name; webapp.setRedirectPath(basePath); + List pathList = new ArrayList(); if (basePath.equals("/")) { webapp.addServePathSpec("/*"); + pathList.add("/*"); } else { webapp.addServePathSpec(basePath); webapp.addServePathSpec(basePath + "/*"); + pathList.add(basePath + "/*"); } if (wsName != null && !wsName.equals(basePath)) { if (wsName.equals("/")) { webapp.addServePathSpec("/*"); + pathList.add("/*"); } else { webapp.addServePathSpec("/" + wsName); webapp.addServePathSpec("/" + wsName + "/*"); + pathList.add("/" + wsName + "/*"); } } if (conf == null) { @@ -212,7 +219,7 @@ public void setup() { HttpServer server = new HttpServer(name, bindAddress, port, findPort, conf, new AdminACLsManager(conf).getAdminAcl(), null, - webapp.getServePathSpecs()) { + pathList.toArray(new String[0])) { { if (UserGroupInformation.isSecurityEnabled()) {