MAPREDUCE-4675. Fixed a race condition caused in TestKillSubProcesses caused due to a recent commit. Contributed by Bikas Saha.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1389638 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -585,6 +585,9 @@ Release 1.1.0 - unreleased
     MAPREDUCE-4673. Fix TestRawHistoryFile and TestJobHistoryServer to not write
     to /tmp. (Arpit Gupta via vinodkv)
 
+    MAPREDUCE-4675. Fixed a race condition caused in TestKillSubProcesses caused
+    due to a recent commit. (Bikas Saha via vinodkv)
+
 Release 1.0.4 - Unreleased
 
   NEW FEATURES

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

@@ -312,6 +312,7 @@ public class TestKillSubProcesses extends TestCase {
     try {
       JobConf conf = new JobConf();
       conf.setLong(JvmManager.JvmManagerForType.DELAY_BEFORE_KILL_KEY, 0L);
+      conf.setFloat(JobTracker.JT_HEARTBEATS_SCALING_FACTOR, 500);
       mr = new MiniMRCluster(1, "file:///", 1, null, null, conf);
 
       // run the TCs