Merge -r 757623:757624 to move the change of HADOOP-5484 from main to branch 0.20.

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

CHANGES.txt

@@ -791,6 +791,9 @@ Release 0.20.0 - Unreleased
     HADOOP-5519. Remove claims from mapred-default.xml that prime numbers
     of tasks are helpful.  (Owen O'Malley via szetszwo)
 
+    HADOOP-5484. TestRecoveryManager fails wtih FileAlreadyExistsException.
+    (Amar Kamat via hairong)
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

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

@@ -171,7 +171,7 @@ public class TestRecoveryManager extends TestCase {
     job1.setJobPriority(JobPriority.HIGH);
     
     UtilsForTests.configureWaitingJobConf(job1, 
-        new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output"), 30, 0, 
+        new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output3"), 30, 0, 
         "test-recovery-manager", signalFile, signalFile);
     
     // submit the faulty job
@@ -189,7 +189,7 @@ public class TestRecoveryManager extends TestCase {
 
     String signalFile1 = new Path(TEST_DIR, "signal1").toString();
     UtilsForTests.configureWaitingJobConf(job2, 
-        new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output1"), 20, 0, 
+        new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output4"), 20, 0, 
         "test-recovery-manager", signalFile1, signalFile1);
     
     // submit the job
@@ -209,7 +209,7 @@ public class TestRecoveryManager extends TestCase {
     job3.set("hadoop.job.ugi","abc,users");
 
     UtilsForTests.configureWaitingJobConf(job3, 
-        new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output2"), 1, 0, 
+        new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output5"), 1, 0, 
         "test-recovery-manager", signalFile, signalFile);
     
     // submit the job