From 719fbf813e5aecee3f9727ff57aa8054e0dc6860 Mon Sep 17 00:00:00 2001 From: Sangjin Lee Date: Wed, 11 Nov 2015 15:37:24 -0800 Subject: [PATCH] MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) (cherry picked from commit 9ad708a0dfa5e82d1a17471b1cf3e76204b32cbc) --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../hadoop/mapred/TestMRTimelineEventHandling.java | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 5b0f4dda25b..7d513a8b3c7 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -19,6 +19,8 @@ Release 2.6.3 - UNRELEASED MAPREDUCE-6528. Memory leak for HistoryFileManager.getJobSummary() (Junping Du via jlowe) + MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java index eab9026c82f..a82007f97c9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java @@ -27,6 +27,7 @@ import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster; import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities; import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.MiniYARNCluster; import org.apache.hadoop.yarn.server.timeline.TimelineStore; import org.junit.Assert; @@ -91,6 +92,9 @@ public class TestMRTimelineEventHandling { TestJobHistoryEventHandler.class.getSimpleName(), 1); cluster.init(conf); cluster.start(); + conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, + MiniYARNCluster.getHostname() + ":" + + cluster.getApplicationHistoryServer().getPort()); TimelineStore ts = cluster.getApplicationHistoryServer() .getTimelineStore(); @@ -145,6 +149,9 @@ public class TestMRTimelineEventHandling { TestJobHistoryEventHandler.class.getSimpleName(), 1); cluster.init(conf); cluster.start(); + conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, + MiniYARNCluster.getHostname() + ":" + + cluster.getApplicationHistoryServer().getPort()); TimelineStore ts = cluster.getApplicationHistoryServer() .getTimelineStore(); @@ -182,6 +189,9 @@ public class TestMRTimelineEventHandling { TestJobHistoryEventHandler.class.getSimpleName(), 1); cluster.init(conf); cluster.start(); + conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, + MiniYARNCluster.getHostname() + ":" + + cluster.getApplicationHistoryServer().getPort()); TimelineStore ts = cluster.getApplicationHistoryServer() .getTimelineStore();