Merge pull request #14 from gluster/BZ916371

fix to make mkdirs(..) tolerant of existing directories during a distrib...

Author: childsb

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java

@@ -46,6 +46,13 @@
  * This package provides interface for hadoop jobs (incl. Map/Reduce)
  * to access files in GlusterFS backed file system via FUSE mount
  */
+
+
+/*
+ * 
+ * TODO: Evaluate LocalFileSystem and RawLocalFileSystem as possible delegate file systems to remove & refactor this code.
+ * 
+ */
 public class GlusterFileSystem extends FileSystem {
 
 	private FileSystem glusterFs = null;
@@ -180,19 +187,21 @@ public boolean exists(Path path) throws IOException {
 		return f.exists();
 	}
 
-	public boolean mkdirs(Path path, FsPermission permission)
-			throws IOException {
-		boolean created = false;
-		Path absolute = makeAbsolute(path);
-		File f = new File(absolute.toUri().getPath());
-
-		if (f.exists()) {
-			System.out.println("Directory " + f.getPath() + " already exist");
-			return true;
-		}
-
-		return f.mkdirs();
-	}
+	/*
+	 * Code copied from:
+	 * @see org.apache.hadoop.fs.RawLocalFileSystem#mkdirs(org.apache.hadoop.fs.Path)
+	 * as incremental fix towards a re-write. of this class to remove duplicity.
+	 * 
+	 */
+	public boolean mkdirs(Path f, FsPermission permission) throws IOException {
+        
+        if(f==null) return true;
+            
+        Path parent = f.getParent();
+        Path absolute = makeAbsolute(f);
+        File p2f = new File(absolute.toUri().getPath());
+        return (f == null || mkdirs(parent)) && (p2f.mkdir() || p2f.isDirectory());
+    }
 
 	@Deprecated
 	public boolean isDirectory(Path path) throws IOException {
@@ -293,9 +302,10 @@ public String getOwner() {
 	 * is an instance of OutputStream class.
 	 */
 	public FSDataOutputStream create(Path path, FsPermission permission,
-			boolean overwrite, int bufferSize, short replication,
+	        boolean overwrite, int bufferSize, short replication,
 			long blockSize, Progressable progress) throws IOException {
-		Path absolute = makeAbsolute(path);
+		
+	    Path absolute = makeAbsolute(path);
 		Path parent = null;
 		File f = null;
 		File fParent = null;
@@ -311,32 +321,9 @@ public FSDataOutputStream create(Path path, FsPermission permission,
 		}
 
 		parent = path.getParent();
-		fParent = new File((makeAbsolute(parent)).toUri().getPath());
-		if ((parent != null) && (fParent != null) && (!fParent.exists())) {
-			if (!fParent.mkdirs()) {
-				//
-				// File.mkdirs() is not multi-process safe. It is possible for
-				// a peer who is running mkdirs() to cause us to fail. In such
-				// a case, a rudimentary test is to try our exists() test for a
-				// second time. The isDirectory() protects us from exists()
-				// passing when a file is put in place of the directory we were
-				// trying to create. We can be fooled by a directory, or set of
-				// directories in the path, being owned by another user or with
-				// incompatible permissions.
-				//
-				// This could be slightly improved to retry the mkdirs(), which
-				// would cover races deep within the fParent's path. Each
-				// iteration will address one race.
-				//
-				if (!fParent.exists() || !fParent.isDirectory()) {
-					throw new IOException("cannot create parent directory: "
-							+ fParent.getPath());
-				}
-			}
-		}
+		mkdirs(parent);
 
-		glusterFileStream = new FSDataOutputStream(new GlusterFUSEOutputStream(
-				f.getPath(), false));
+		glusterFileStream = new FSDataOutputStream(new GlusterFUSEOutputStream(f.getPath(), false));
 
 		return glusterFileStream;
 	}