Repository: hadoop Updated Branches: refs/heads/branch-2 ee5c20dde -> bb5dd7f77
YARN-4183. Reverting the patch to fix behaviour change. Revert "YARN-4183. Enabling generic application history forces every job to get a timeline service delegation token (jeagles)" This reverts commit 42bc525acb78088ed952e92aa49408413937de86. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb5dd7f7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb5dd7f7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb5dd7f7 Branch: refs/heads/branch-2 Commit: bb5dd7f7728825d97184346b3fb7374d4676e900 Parents: ee5c20d Author: Vinod Kumar Vavilapalli (I am also known as @tshooter.) <[email protected]> Authored: Wed Nov 11 10:42:52 2015 -0800 Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) <[email protected]> Committed: Wed Nov 11 10:42:52 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 --- .../server/resourcemanager/metrics/SystemMetricsPublisher.java | 4 ++-- .../resourcemanager/metrics/TestSystemMetricsPublisher.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb5dd7f7/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c197026..27ffea4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1107,9 +1107,6 @@ Release 2.7.2 - UNRELEASED YARN-2902. Killing a container that is localizing can orphan resources in the DOWNLOADING state (Varun Saxena via jlowe) - YARN-4183. Enabling generic application history forces every job to get a - timeline service delegation token (Mit Desai via jeagles) - YARN-4313. Race condition in MiniMRYarnCluster when getting history server address. (Jian He via xgong) http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb5dd7f7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java index c73e835..0f09735 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java @@ -77,8 +77,8 @@ public class SystemMetricsPublisher extends CompositeService { @Override protected void serviceInit(Configuration conf) throws Exception { publishSystemMetrics = - conf.getBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED, - YarnConfiguration.DEFAULT_APPLICATION_HISTORY_ENABLED) && + conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, + YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED) && conf.getBoolean(YarnConfiguration.RM_SYSTEM_METRICS_PUBLISHER_ENABLED, YarnConfiguration.DEFAULT_RM_SYSTEM_METRICS_PUBLISHER_ENABLED); http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb5dd7f7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java index e2fbf8d..98daae7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java @@ -73,7 +73,7 @@ public class TestSystemMetricsPublisher { @BeforeClass public static void setup() throws Exception { YarnConfiguration conf = new YarnConfiguration(); - conf.setBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED, true); + conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); conf.setBoolean(YarnConfiguration.RM_SYSTEM_METRICS_PUBLISHER_ENABLED, true); conf.setClass(YarnConfiguration.TIMELINE_SERVICE_STORE, MemoryTimelineStore.class, TimelineStore.class);
