hadoop git commit: YARN-3624. ApplicationHistoryServer should not reverse the order of the filters it gets. Contributed by Mit Desai
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 2b4c7fcc6 -> 4c6e24528
YARN-3624. ApplicationHistoryServer should not reverse the order of the
filters it gets. Contributed by Mit Desai
(cherry picked from commit d1b9b852442cb93b413eff8a137db6213e730d9c)
(cherry picked from commit bf3f08cc634c97fd31cc481b9fef3ccb2a53e5e9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c6e2452
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c6e2452
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c6e2452
Branch: refs/heads/branch-2.7
Commit: 4c6e24528d06ab71aae5c559292a9c4cbd17cb51
Parents: 2b4c7fc
Author: Xuan
Authored: Thu Sep 24 15:01:17 2015 -0700
Committer: Xuan
Committed: Thu Sep 24 15:04:37 2015 -0700
--
hadoop-yarn-project/CHANGES.txt| 4 ++--
.../ApplicationHistoryServer.java | 13 -
.../TestApplicationHistoryServer.java | 4 ++--
3 files changed, 12 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6e2452/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d86b810..a39face 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -82,8 +82,8 @@ Release 2.7.2 - UNRELEASED
YARN-3975. WebAppProxyServlet should not redirect to RM page if AHS is
enabled (Mit Desai via jlowe)
-YARN-3740. Fixed the typo in the configuration name:
-APPLICATION_HISTORY_PREFIX_MAX_APPS. (Xuan Gong via zjshen)
+YARN-3624. ApplicationHistoryServer should not reverse the order of the
+filters it gets. (Mit Desai via xgong)
Release 2.7.1 - 2015-07-06
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6e2452/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 88cd153..6081a87 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -232,17 +232,20 @@ public class ApplicationHistoryServer extends
CompositeService {
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;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6e2452/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
index a7e7daa..01c309c 100644
---
a/hadoop-yarn-pr
hadoop git commit: YARN-3624. ApplicationHistoryServer should not reverse the order of the filters it gets. Contributed by Mit Desai
Repository: hadoop
Updated Branches:
refs/heads/branch-2 4ba0febd5 -> bf3f08cc6
YARN-3624. ApplicationHistoryServer should not reverse the order of the
filters it gets. Contributed by Mit Desai
(cherry picked from commit d1b9b852442cb93b413eff8a137db6213e730d9c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf3f08cc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf3f08cc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf3f08cc
Branch: refs/heads/branch-2
Commit: bf3f08cc634c97fd31cc481b9fef3ccb2a53e5e9
Parents: 4ba0feb
Author: Xuan
Authored: Thu Sep 24 15:01:17 2015 -0700
Committer: Xuan
Committed: Thu Sep 24 15:03:05 2015 -0700
--
hadoop-yarn-project/CHANGES.txt| 3 +++
.../ApplicationHistoryServer.java | 13 -
.../TestApplicationHistoryServer.java | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf3f08cc/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index af36023..a05e934 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -939,6 +939,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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf3f08cc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 0ec27d7..dd571f8 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -242,17 +242,20 @@ public class ApplicationHistoryServer extends
CompositeService {
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;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf3f08cc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
index a7e7daa..01c309c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHist
hadoop git commit: YARN-3624. ApplicationHistoryServer should not reverse the order of the filters it gets. Contributed by Mit Desai
Repository: hadoop
Updated Branches:
refs/heads/trunk 9cc9f8126 -> d1b9b8524
YARN-3624. ApplicationHistoryServer should not reverse the order of the
filters it gets. Contributed by Mit Desai
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d1b9b852
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d1b9b852
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d1b9b852
Branch: refs/heads/trunk
Commit: d1b9b852442cb93b413eff8a137db6213e730d9c
Parents: 9cc9f81
Author: Xuan
Authored: Thu Sep 24 15:01:17 2015 -0700
Committer: Xuan
Committed: Thu Sep 24 15:01:17 2015 -0700
--
hadoop-yarn-project/CHANGES.txt| 3 +++
.../ApplicationHistoryServer.java | 13 -
.../TestApplicationHistoryServer.java | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1b9b852/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 999d82f..f7ea26e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1b9b852/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 0ec27d7..dd571f8 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -242,17 +242,20 @@ public class ApplicationHistoryServer extends
CompositeService {
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;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1b9b852/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
index a7e7daa..01c309c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/had
