commit d5834b6e2c93817d31311b411c8c90797561ea5a

Author: Arun C Murthy <acmurthy@apache.org>
Date:   Wed Mar 17 10:30:20 2010 -0700

    MAPREDUCE-1606 from https://issues.apache.org/jira/secure/attachment/12439054/MR1606.20S.1.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    MAPREDUCE-1606. Fixed occassinal timeout in TestJobACL. (Ravi Gummadi via
    +    acmurthy)
    +
    +   HADOOP-6633. normalize property names for JT/NN kerberos principal


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

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

@@ -83,8 +83,11 @@ public class TestJobACLs {
     conf.setBoolean("mapred.job.tracker.persist.jobstatus.active", true);
     conf.set("mapred.job.tracker.persist.jobstatus.hours", "1");
 
-    mr =
-        new MiniMRCluster(0, 0, 0, "file:///", 1, null, null, MR_UGI, conf);
+    // Let us have enough slots sothat there won't be contention for slots
+    // for launching JOB_CLEANUP tasks
+    conf.set("mapred.tasktracker.map.tasks.maximum", "4");
+
+    mr = new MiniMRCluster(0, 0, 2, "file:///", 1, null, null, MR_UGI, conf);
   }
 
   /**
@@ -140,6 +143,14 @@ public class TestJobACLs {
     job.killJob();
   }
 
+  /**
+   * Submits a sleep job with 1 map task that runs for a long time(2000 sec)
+   * @param clusterConf
+   * @param user the jobOwner
+   * @return RunningJob that is started
+   * @throws IOException
+   * @throws InterruptedException
+   */
   private RunningJob submitJobAsUser(final JobConf clusterConf, String user)
       throws IOException, InterruptedException {
     UserGroupInformation ugi =
@@ -150,7 +161,7 @@ public class TestJobACLs {
         JobClient jobClient = new JobClient(clusterConf);
         SleepJob sleepJob = new SleepJob();
         sleepJob.setConf(clusterConf);
-        JobConf jobConf = sleepJob.setupJobConf(0, 0, 1000, 1000, 1000, 1000);
+        JobConf jobConf = sleepJob.setupJobConf(1, 0, 2000, 1000, 1000, 1000);
         RunningJob runningJob = jobClient.submitJob(jobConf);
         return runningJob;
       }