Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3624. ApplicationHistoryServer should not reverse the order of the 

filters it gets. Contributed by Mit Desai

(cherry picked from commit d1b9b85244)
This commit is contained in:
Xuan 2015-09-24 15:01:17 -07:00
parent 4ba0febd58
commit bf3f08cc63
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -939,6 +939,9 @@ Release 2.7.2 - UNRELEASED
YARN-3975. WebAppProxyServlet should not redirect to RM page if AHS is YARN-3975. WebAppProxyServlet should not redirect to RM page if AHS is
enabled (Mit Desai via jlowe) enabled (Mit Desai via jlowe)
YARN-3624. ApplicationHistoryServer should not reverse the order of the
filters it gets. (Mit Desai via xgong)
Release 2.7.1 - 2015-07-06 Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
View File

@ -242,17 +242,20 @@ public class ApplicationHistoryServer extends CompositeService {
if(conf.getBoolean(YarnConfiguration if(conf.getBoolean(YarnConfiguration
.TIMELINE_SERVICE_HTTP_CROSS_ORIGIN_ENABLED, YarnConfiguration .TIMELINE_SERVICE_HTTP_CROSS_ORIGIN_ENABLED, YarnConfiguration
.TIMELINE_SERVICE_HTTP_CROSS_ORIGIN_ENABLED_DEFAULT)) { .TIMELINE_SERVICE_HTTP_CROSS_ORIGIN_ENABLED_DEFAULT)) {
initializers = CrossOriginFilterInitializer.class.getName() + "," if (initializers.length() != 0) {
+ initializers; initializers += ",";
}
initializers += CrossOriginFilterInitializer.class.getName();
modifiedInitializers = true; modifiedInitializers = true;
} }
} }
if (!initializers.contains(TimelineAuthenticationFilterInitializer.class if (!initializers.contains(TimelineAuthenticationFilterInitializer.class
.getName())) { .getName())) {
initializers = if (initializers.length() != 0) {
TimelineAuthenticationFilterInitializer.class.getName() + "," initializers += ",";
+ initializers; }
initializers += TimelineAuthenticationFilterInitializer.class.getName();
modifiedInitializers = true; modifiedInitializers = true;
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
View File

@ -138,8 +138,8 @@ public class TestApplicationHistoryServer {
HashMap<String, String> driver = new HashMap<String, String>(); HashMap<String, String> driver = new HashMap<String, String>();
driver.put("", TimelineAuthenticationFilterInitializer.class.getName()); driver.put("", TimelineAuthenticationFilterInitializer.class.getName());
driver.put(StaticUserWebFilter.class.getName(), driver.put(StaticUserWebFilter.class.getName(),
TimelineAuthenticationFilterInitializer.class.getName() + "," StaticUserWebFilter.class.getName() + "," +
+ StaticUserWebFilter.class.getName()); TimelineAuthenticationFilterInitializer.class.getName());
driver.put(AuthenticationFilterInitializer.class.getName(), driver.put(AuthenticationFilterInitializer.class.getName(),
TimelineAuthenticationFilterInitializer.class.getName()); TimelineAuthenticationFilterInitializer.class.getName());
driver.put(TimelineAuthenticationFilterInitializer.class.getName(), driver.put(TimelineAuthenticationFilterInitializer.class.getName(),