commit 3d1120246eda098f8212a73c17754866ad27900e

Author: Vinay Kumar Thota <vinayt@yahoo-inc.com>
Date:   Thu Jul 29 09:05:22 2010 +0000

    MAPREDUCE:1962 from https://issues.apache.org/jira/secure/attachment/12450796/1962-ydist-security.patch


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

src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java

@@ -62,12 +62,13 @@ public class TestChildsKillingOfMemoryExceedsTask {
 
   @BeforeClass
   public static void before() throws Exception {
-    Hashtable<String,Long> prop = new Hashtable<String,Long>();
+    Hashtable<String,Object> prop = new Hashtable<String,Object>();
     prop.put("mapred.cluster.max.map.memory.mb", 2 * 1024L);
     prop.put("mapred.cluster.map.memory.mb", 1024L);
     prop.put("mapred.cluster.max.reduce.memory.mb", 2 * 1024L);
     prop.put("mapred.cluster.reduce.memory.mb", 1024L);
     prop.put("mapred.map.max.attempts", 1L);
+    prop.put("mapreduce.job.complete.cancel.delegation.tokens", false);
 
     String [] expExcludeList = {"java.net.ConnectException",
     "java.io.IOException"};

src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java

@@ -56,9 +56,10 @@ public class TestChildsKillingOfSuspendTask {
   
   @BeforeClass
   public static void before() throws Exception {
-    Hashtable<String,Long> prop = new Hashtable<String,Long>();
+    Hashtable<String,Object> prop = new Hashtable<String,Object>();
     prop.put("mapred.map.max.attempts",1L);
     prop.put("mapred.task.timeout",30000L);
+    prop.put("mapreduce.job.complete.cancel.delegation.tokens", false);
     String [] expExcludeList = {"java.net.ConnectException",
     "java.io.IOException"};
     cluster = MRCluster.createCluster(conf);

src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java

@@ -44,8 +44,9 @@ public class TestLostTaskTracker {
     cluster = MRCluster.createCluster(conf);
     cluster.setExcludeExpList(expExcludeList);
     cluster.setUp();
-    Hashtable<String,Long> prop = new Hashtable<String,Long>();
+    Hashtable<String,Object> prop = new Hashtable<String,Object>();
     prop.put("mapred.tasktracker.expiry.interval",30000L);
+    prop.put("mapreduce.job.complete.cancel.delegation.tokens",false);
     cluster.restartClusterWithNewConfig(prop, confFile);
     UtilsForTests.waitFor(1000);
     conf = cluster.getJTClient().getProxy().getDaemonConf();

src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java

@@ -64,8 +64,9 @@ public class TestTaskChildsKilling {
 
   @BeforeClass
   public static void before() throws Exception {
-    Hashtable<String,Long> prop = new Hashtable<String,Long>();
+    Hashtable<String,Object> prop = new Hashtable<String,Object>();
     prop.put("mapred.map.max.attempts", 1L);
+    prop.put("mapreduce.job.complete.cancel.delegation.tokens",false);
     String [] expExcludeList = {"java.net.ConnectException",
         "java.io.IOException"};
     cluster = MRCluster.createCluster(conf);

src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java

@@ -410,11 +410,19 @@ public class TestTaskKilling {
                     isTempFolderExists);
     counter = 0;
     while (counter < 30) {
+      if (taskInfo.getTaskStatus().length > 0) {
+        break;
+      }
       UtilsForTests.waitFor(1000);
       taskInfo = remoteJTClient.getTaskInfo(tID);
       counter ++;
     }
 
+    while (taskInfo.getTaskStatus()[0].getRunState() == 
+      TaskStatus.State.RUNNING) {
+      UtilsForTests.waitFor(1000);
+      taskInfo = remoteJTClient.getTaskInfo(tID);
+    } 
     Assert.assertEquals("Task status has not been changed to FAILED.", 
             taskInfo.getTaskStatus()[0].getRunState(), 
                     TaskStatus.State.FAILED);