MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen.

This commit is contained in:
Vinod Kumar Vavilapalli 2014-10-29 09:57:39 -07:00
parent ec63a3ffbd
commit 3f1441245d
3 changed files with 5 additions and 0 deletions

View File

@ -447,6 +447,9 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent.
(Junping Du via jianhe) (Junping Du via jianhe)
MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and
TestMRTimelineEventHandling. (Zhijie Shen via vinodkv)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -446,6 +446,7 @@ public void testTimelineEventHandling() throws Exception {
TestParams t = new TestParams(false); TestParams t = new TestParams(false);
Configuration conf = new YarnConfiguration(); Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext, 0); JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext, 0);
jheh.init(conf); jheh.init(conf);
MiniYARNCluster yarnCluster = null; MiniYARNCluster yarnCluster = null;

View File

@ -38,6 +38,7 @@ public class TestMRTimelineEventHandling {
public void testMRTimelineEventHandling() throws Exception { public void testMRTimelineEventHandling() throws Exception {
Configuration conf = new YarnConfiguration(); Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
MiniMRYarnCluster cluster = null; MiniMRYarnCluster cluster = null;
try { try {
cluster = new MiniMRYarnCluster( cluster = new MiniMRYarnCluster(