Skip to content

Commit

Permalink
YARN-3624. ApplicationHistoryServer should not reverse the order of the
Browse files Browse the repository at this point in the history
filters it gets. Contributed by Mit Desai
xgong committed Sep 24, 2015

Verified

This commit was signed with the committer’s verified signature.
jorenham Joren Hammudoglu
1 parent 9cc9f81 commit d1b9b85
Showing 3 changed files with 13 additions and 7 deletions.
3 changes: 3 additions & 0 deletions hadoop-yarn-project/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -991,6 +991,9 @@ Release 2.7.2 - UNRELEASED
YARN-3975. WebAppProxyServlet should not redirect to RM page if AHS is
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

INCOMPATIBLE CHANGES
Original file line number Diff line number Diff line change
@@ -242,17 +242,20 @@ private void startWebApp() {
if(conf.getBoolean(YarnConfiguration
.TIMELINE_SERVICE_HTTP_CROSS_ORIGIN_ENABLED, YarnConfiguration
.TIMELINE_SERVICE_HTTP_CROSS_ORIGIN_ENABLED_DEFAULT)) {
initializers = CrossOriginFilterInitializer.class.getName() + ","
+ initializers;
if (initializers.length() != 0) {
initializers += ",";
}
initializers += CrossOriginFilterInitializer.class.getName();
modifiedInitializers = true;
}
}

if (!initializers.contains(TimelineAuthenticationFilterInitializer.class
.getName())) {
initializers =
TimelineAuthenticationFilterInitializer.class.getName() + ","
+ initializers;
if (initializers.length() != 0) {
initializers += ",";
}
initializers += TimelineAuthenticationFilterInitializer.class.getName();
modifiedInitializers = true;
}

Original file line number Diff line number Diff line change
@@ -138,8 +138,8 @@ public void testFilterOverrides() throws Exception {
HashMap<String, String> driver = new HashMap<String, String>();
driver.put("", TimelineAuthenticationFilterInitializer.class.getName());
driver.put(StaticUserWebFilter.class.getName(),
TimelineAuthenticationFilterInitializer.class.getName() + ","
+ StaticUserWebFilter.class.getName());
StaticUserWebFilter.class.getName() + "," +
TimelineAuthenticationFilterInitializer.class.getName());
driver.put(AuthenticationFilterInitializer.class.getName(),
TimelineAuthenticationFilterInitializer.class.getName());
driver.put(TimelineAuthenticationFilterInitializer.class.getName(),

0 comments on commit d1b9b85

Please sign in to comment.