Fix parent directory creation in distcp-ng

apache · Jan 29, 2016 · c9bbf00 · c9bbf00
1 parent 061c715
commit c9bbf00
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/...ent/src/main/java/gobblin/data/management/copy/writer/FileAwareInputStreamDataWriter.java b/...ent/src/main/java/gobblin/data/management/copy/writer/FileAwareInputStreamDataWriter.java
@@ -276,9 +276,8 @@ public void commit() throws IOException {
 
       Iterator<OwnerAndPermission> ancestorOwnerAndPermissionIt = copyableFile.getAncestorsOwnerAndPermission() == null ?
           Iterators.<OwnerAndPermission>emptyIterator() : copyableFile.getAncestorsOwnerAndPermission().iterator();
-      if (!ensureDirectoryExists(this.fs, outputFilePath.getParent(), ancestorOwnerAndPermissionIt)) {
-        throw new IOException(String.format("Could not create ancestors for %s", outputFilePath));
-      }
+
+      ensureDirectoryExists(this.fs, outputFilePath.getParent(), ancestorOwnerAndPermissionIt);
 
       if (!this.fs.rename(stagingFilePath, outputFilePath)) {
           // target exists
@@ -297,11 +296,11 @@ public void commit() throws IOException {
     }
   }
 
-  private boolean ensureDirectoryExists(FileSystem fs, Path path,
+  private void ensureDirectoryExists(FileSystem fs, Path path,
       Iterator<OwnerAndPermission> ownerAndPermissionIterator) throws IOException {
 
     if (fs.exists(path)) {
-      return true;
+      return;
     }
 
     if (ownerAndPermissionIterator.hasNext()) {
@@ -312,11 +311,13 @@ private boolean ensureDirectoryExists(FileSystem fs, Path path,
       if (ownerAndPermission.getFsPermission() == null) {
         // use default permissions
         if (!fs.mkdirs(path)) {
-          return false;
+          // fs.mkdirs returns false if path already existed. Do not overwrite permissions
+          return;
         }
       } else {
         if (!fs.mkdirs(path, addExecutePermissionToOwner(ownerAndPermission.getFsPermission()))) {
-          return false;
+          // fs.mkdirs returns false if path already existed. Do not overwrite permissions
+          return;
         }
       }
       String group = ownerAndPermission.getGroup();
@@ -325,9 +326,8 @@ private boolean ensureDirectoryExists(FileSystem fs, Path path,
         fs.setOwner(path, owner, group);
       }
     } else {
-      return fs.mkdirs(path);
+      fs.mkdirs(path);
     }
-    return true;
   }
 
   @Override