Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) 

(cherry picked from commit 9ad708a0df)
This commit is contained in:
Sangjin Lee 2015-11-11 15:37:24 -08:00
parent 6c178cc321
commit 719fbf813e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -19,6 +19,8 @@ Release 2.6.3 - UNRELEASED
MAPREDUCE-6528. Memory leak for HistoryFileManager.getJobSummary() MAPREDUCE-6528. Memory leak for HistoryFileManager.getJobSummary()
(Junping Du via jlowe) (Junping Du via jlowe)
MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee)
Release 2.6.2 - 2015-10-28 Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java
View File

@ -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.TimelineEntities;
import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity; import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.MiniYARNCluster;
import org.apache.hadoop.yarn.server.timeline.TimelineStore; import org.apache.hadoop.yarn.server.timeline.TimelineStore;
import org.junit.Assert; import org.junit.Assert;
@ -91,6 +92,9 @@ public class TestMRTimelineEventHandling {
TestJobHistoryEventHandler.class.getSimpleName(), 1); TestJobHistoryEventHandler.class.getSimpleName(), 1);
cluster.init(conf); cluster.init(conf);
cluster.start(); cluster.start();
conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
MiniYARNCluster.getHostname() + ":"
+ cluster.getApplicationHistoryServer().getPort());
TimelineStore ts = cluster.getApplicationHistoryServer() TimelineStore ts = cluster.getApplicationHistoryServer()
.getTimelineStore(); .getTimelineStore();
@ -145,6 +149,9 @@ public class TestMRTimelineEventHandling {
TestJobHistoryEventHandler.class.getSimpleName(), 1); TestJobHistoryEventHandler.class.getSimpleName(), 1);
cluster.init(conf); cluster.init(conf);
cluster.start(); cluster.start();
conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
MiniYARNCluster.getHostname() + ":"
+ cluster.getApplicationHistoryServer().getPort());
TimelineStore ts = cluster.getApplicationHistoryServer() TimelineStore ts = cluster.getApplicationHistoryServer()
.getTimelineStore(); .getTimelineStore();
@ -182,6 +189,9 @@ public class TestMRTimelineEventHandling {
TestJobHistoryEventHandler.class.getSimpleName(), 1); TestJobHistoryEventHandler.class.getSimpleName(), 1);
cluster.init(conf); cluster.init(conf);
cluster.start(); cluster.start();
conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
MiniYARNCluster.getHostname() + ":"
+ cluster.getApplicationHistoryServer().getPort());
TimelineStore ts = cluster.getApplicationHistoryServer() TimelineStore ts = cluster.getApplicationHistoryServer()
.getTimelineStore(); .getTimelineStore();