Repository: hadoop Updated Branches: refs/heads/branch-2 8726a5e02 -> 3214c2331
MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) (cherry picked from commit 9ad708a0dfa5e82d1a17471b1cf3e76204b32cbc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3214c233 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3214c233 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3214c233 Branch: refs/heads/branch-2 Commit: 3214c2331f29ec5a19f0bfb17094d07a06c24dcd Parents: 8726a5e Author: Sangjin Lee <sj...@apache.org> Authored: Wed Nov 11 15:37:24 2015 -0800 Committer: Sangjin Lee <sj...@apache.org> Committed: Wed Nov 11 16:22:28 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../apache/hadoop/mapred/TestMRTimelineEventHandling.java | 10 ++++++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3214c233/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 9fb4e08..e7966be 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -344,6 +344,8 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6533. testDetermineCacheVisibilities of TestClientDistributedCacheManager is broken (Chang Li via jlowe) + MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3214c233/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java ---------------------------------------------------------------------- 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 eab9026..a82007f 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();
