MAPREDUCE-7474. Manifest committer resilience: test failure

Change-Id: I039ec6e4dc12f68690ffa977ebb81056ab0d1711

Author: steveloughran

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/impl/ManifestStoreOperations.java

@@ -109,7 +109,7 @@ public abstract boolean delete(Path path, boolean recursive)
    */
   public boolean deleteFile(Path path)
       throws IOException {
-    return delete(path, true);
+    return delete(path, false);
   }
 
   /**

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/stages/AbstractJobOrTaskStage.java

@@ -746,7 +746,7 @@ protected boolean storeSupportsResilientCommit() {
    */
   private void maybeDeleteDest(final boolean deleteDest, final Path dest) throws IOException {
 
-    if (deleteDest && getFileStatusOrNull(dest) != null) {
+    if (deleteDest) {
       final FileStatus st = getFileStatusOrNull(dest);
       if (st != null) {
         if (st.isDirectory()) {

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/TestCreateOutputDirectoriesStage.java

@@ -247,7 +247,7 @@ public void testPrepareDirtyTree() throws Throwable {
     CreateOutputDirectoriesStage attempt2 =
         new CreateOutputDirectoriesStage(
             createStageConfigForJob(JOB1, destDir)
-                .withDeleteTargetPaths(true));
+                .withDeleteTargetPaths(false));
     // attempt will fail because one of the entries marked as
     // a file to delete is now a non-empty directory
     LOG.info("Executing failing attempt to create the directories");