Author: vinodkv Date: Tue Aug 27 23:39:16 2013 New Revision: 1518031 URL: http://svn.apache.org/r1518031 Log: YARN-981. Fixed YARN webapp so that /logs servlet works like before. Contributed by Jian He. svn merge --ignore-ancestry -c 1518030 ../../trunk/
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1518031&r1=1518030&r2=1518031&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Aug 27 23:39:16 2013 @@ -90,6 +90,9 @@ Release 2.1.1-beta - UNRELEASED YARN-1008. MiniYARNCluster with multiple nodemanagers, all nodes have same key for allocations. (tucu) + YARN-981. Fixed YARN webapp so that /logs servlet works like before. (Jian He + via vinodkv) + Release 2.1.0-beta - 2013-08-22 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java?rev=1518031&r1=1518030&r2=1518031&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java Tue Aug 27 23:39:16 2013 @@ -242,7 +242,10 @@ public class WebApps { for(Map.Entry<String, Object> entry : attributes.entrySet()) { server.setAttribute(entry.getKey(), entry.getValue()); } - server.addGlobalFilter("guice", GuiceFilter.class.getName(), null); + String webAppPath = "/" + name + "/*"; + server.defineFilter(server.getWebAppContext(), "guice", + GuiceFilter.class.getName(), null, new String[] { webAppPath, "/" }); + webapp.setConf(conf); webapp.setHttpServer(server); server.start();