hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1389640 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java
Date Mon, 24 Sep 2012 22:39:41 GMT
Author: vinodkv
Date: Mon Sep 24 22:39:41 2012
New Revision: 1389640

URL: http://svn.apache.org/viewvc?rev=1389640&view=rev
Log:
MAPREDUCE-4675. Fixed a race condition caused in TestKillSubProcesses caused due to a recent
commit. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1389638 ../branch-1

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt
    hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1389640&r1=1389639&r2=1389640&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Sep 24 22:39:41 2012
@@ -353,7 +353,9 @@ Release 1.1.0 - 2012.09.16
     MAPREDUCE-4673. Fix TestRawHistoryFile and TestJobHistoryServer to not write
     to /tmp. (Arpit Gupta via vinodkv)
 
->>>>>>> .merge-right.r1389528
+    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

Modified: hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java?rev=1389640&r1=1389639&r2=1389640&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java
(original)
+++ hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java
Mon Sep 24 22:39:41 2012
@@ -312,6 +312,7 @@ public class TestKillSubProcesses extend
     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



Mime
View raw message