svn commit: r1499102 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java

[cnauroth]

Author: cnauroth
Date: Tue Jul  2 20:34:03 2013
New Revision: 1499102

URL: http://svn.apache.org/r1499102
Log:
HADOOP-9677. TestSetupAndCleanupFailure#testWithDFS fails on Windows. 
Contributed by Xi Fang.

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1499102&r1=1499101&r2=1499102&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Jul  2 
20:34:03 2013
@@ -282,6 +282,9 @@ Branch-hadoop-1-win (branched from branc
     HADOOP-9681. FileUtil.unTarUsingJava() should close the InputStream upon
     finishing. (Chuan Liu via cnauroth)
 
+    HADOOP-9677. TestSetupAndCleanupFailure#testWithDFS fails on Windows.
+    (Xi Fang via cnauroth)
+
   Merged from branch-1
 
     HDFS-385. Backport: Add support for an experimental API that allows a

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java?rev=1499102&r1=1499101&r2=1499102&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java
 Tue Jul  2 20:34:03 2013
@@ -260,9 +260,15 @@ public class TestSetupAndCleanupFailure 
     try {
       final int taskTrackers = 4;
       Configuration conf = new Configuration();
+      // On Windows, a delay kill is used (see JVMManager#kill()) for
+      // killing JVM and Signal.TERM is ignored. Setting
+      // "mapred.tasktracker.tasks.sleeptime-before-sigkill" to zero
+      // ensures that the kill will be executed with no delay so that the
+      // setup/cleanup attempts get killed immediately
+      conf.set("mapred.tasktracker.tasks.sleeptime-before-sigkill", "0");
       dfs = new MiniDFSCluster(conf, 4, true, null);
       fileSys = dfs.getFileSystem();
-      JobConf jtConf = new JobConf();
+      JobConf jtConf = new JobConf(conf);
       jtConf.setInt("mapred.tasktracker.map.tasks.maximum", 1);
       jtConf.setInt("mapred.tasktracker.reduce.tasks.maximum", 1);
       jtConf.setLong("mapred.tasktracker.expiry.interval", 10 * 1000);