From 2bd64879f47abf7702c1a8140b789d4b7e3c24e2 Mon Sep 17 00:00:00 2001 From: "Vinod Kumar Vavilapalli (I am also known as @tshooter.)" Date: Wed, 11 Nov 2015 10:46:32 -0800 Subject: [PATCH] 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 3287a50cfe4b978d3776e3cce2218e0b10e3e519. --- hadoop-yarn-project/CHANGES.txt | 3 --- .../resourcemanager/metrics/SystemMetricsPublisher.java | 4 ++-- .../resourcemanager/metrics/TestSystemMetricsPublisher.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index e8bf9bcc588..96ac6116e10 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -115,9 +115,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) 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 273c1d97c0d..b849b0035db 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 @@ -75,8 +75,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); 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 40a4b9a8263..7ed3835bdb7 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 @@ -66,7 +66,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);