Merge -r 732616:732617 from trunk onto 0.20 branch. Fixes HADOOP-4787.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@732618 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -511,6 +511,9 @@ Release 0.20.0 - Unreleased
 
     HADOOP-4949. Fix native compilation. (Chris Douglas via acmurthy) 
 
+    HADOOP-4787. Fixes the testcase TestTrackerBlacklistAcrossJobs which was
+    earlier failing randomly. (Amareshwari Sriramadasu via ddas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

src/test/org/apache/hadoop/mapred/TestTrackerBlacklistAcrossJobs.java

@@ -71,7 +71,6 @@ public class TestTrackerBlacklistAcrossJobs extends TestCase {
                                  new Path(inDir + "/file"), (short) 1);
     // start mr cluster
     JobConf jtConf = new JobConf();
-    jtConf.setInt("mapred.max.tracker.failures", 1);
     jtConf.setInt("mapred.max.tracker.blacklists", 1);
     mr = new MiniMRCluster(3, fileSys.getUri().toString(),
                            1, null, hosts, jtConf);
@@ -79,6 +78,7 @@ public class TestTrackerBlacklistAcrossJobs extends TestCase {
     // setup job configuration
     JobConf mrConf = mr.createJobConf();
     JobConf job = new JobConf(mrConf);
+    job.setInt("mapred.max.tracker.failures", 1);
     job.setNumMapTasks(30);
     job.setNumReduceTasks(0);
     job.setMapperClass(SleepJobFailOnHost.class);