merge with other pul reqs

Author: jayunit100

pom.xml

@@ -4,9 +4,15 @@
   <groupId>org.apache.hadoop.fs.glusterfs</groupId>
   <artifactId>glusterfs</artifactId>
   <packaging>jar</packaging>
-  <version>0.20.2-0.1</version>
+  <version>0.20.2-0.1-SNAPSHOT</version>
   <name>glusterfs</name>
   <url>http://maven.apache.org</url>
+
+  <!-- Used for formatting the jar with timestamp -->
+  <properties>
+    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+  </properties>
+
   <dependencies>
     <dependency>
 	<groupId>junit</groupId>
@@ -20,6 +26,7 @@
     </dependency>
   </dependencies>
   <build>
+    <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
     <plugins>
       <plugin>
 		<groupId>org.apache.maven.plugins</groupId>

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

@@ -47,6 +47,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;
@@ -101,6 +108,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
 		String volName = null;
 		String remoteGFSServer = null;
 		String needQuickRead = null;
+		boolean autoMount = true;
 
 		if (this.mounted)
 			return;
@@ -112,6 +120,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
 			glusterMount = conf.get("fs.glusterfs.mount", null);
 			remoteGFSServer = conf.get("fs.glusterfs.server", null);
 			needQuickRead = conf.get("quick.slave.io", null);
+			autoMount = conf.getBoolean("fs.glusterfs.automount", true);
 
 			/*
 			 * bail out if we do not have enough information to do a FUSE mount
@@ -124,12 +133,18 @@ public void initialize(URI uri, Configuration conf) throws IOException {
 								+ ",glustermount=" + glusterMount);
 
 			ret = FUSEMount(volName, remoteGFSServer, glusterMount);
-			if (!ret) {
-				throw new RuntimeException("Failed to init Gluster FS");
-			}
-
-			if((needQuickRead.length() != 0)
-					&& (needQuickRead.equalsIgnoreCase("yes")
+			
+                    if (!ret) {
+                        	throw new RuntimeException("Failed to init Gluster FS");
+                    }
+			        if (autoMount) {
+			        	ret = FUSEMount(volName, remoteGFSServer, glusterMount);
+			        	if (!ret) {
+			        		throw new RuntimeException("Initialize: Failed to mount GlusterFS ");
+			        	}
+			        }
+			        if((needQuickRead.length() != 0)
+			        		&& (needQuickRead.equalsIgnoreCase("yes")
 							|| needQuickRead.equalsIgnoreCase("on") || needQuickRead
 								.equals("1")))
 				this.quickSlaveIO = true;
@@ -184,19 +199,22 @@ 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 {
@@ -403,9 +421,10 @@ public FileStatus getFileStatus(Path path) throws IOException {
 	 * 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;
@@ -421,32 +440,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;
 	}