Merge branch 'master' into hadoop-2.1.0

Author: childsb

pom.xml

@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.hadoop.fs.glusterfs</groupId>
+	<groupId>org.gluster</groupId>
 	<artifactId>glusterfs-hadoop</artifactId>
 	<packaging>jar</packaging>
 	<!-- from now, we will update version manually and ignore maven snapshot 
 		features -->
-	<version>2.3.2</version>
+	<version>2.3.8</version>
 	<name>glusterfs-hadoop</name>
 	<url>http://maven.apache.org</url>
 

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

@@ -72,6 +72,7 @@ public boolean exists(Path f) throws IOException{
 
     public void setConf(Configuration conf){
         log.info("Configuring GlusterFS");
+        if(conf!=null) conf.addResource("glusterfs-site.xml");
         super.setConf(conf);
     }
 

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

@@ -21,6 +21,7 @@
 
 package org.apache.hadoop.fs.glusterfs;
 
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -197,8 +198,12 @@ public File pathToFile(Path path) {
       }else if(volume==null){
           volume = default_volume;
       }
-
-      return new File(this.volumes.get(volume) + "/" + path.toUri().getPath());
+      String volPath = this.volumes.get(volume);
+      if(volPath==null){
+          throw new RuntimeException("Error undefined volume:" + volume + " in path: " + path);
+      }
+              
+      return new File(volPath + "/" + path.toUri().getPath());
     }
 
     protected Path getInitialWorkingDirectory() {
@@ -208,7 +213,8 @@ protected Path getInitialWorkingDirectory() {
 
 	public Path fileToPath(File path) {
 	    Enumeration<String> all = volumes.keys();
-	    String rawPath = path.toURI().getRawPath();
+	    String rawPath = path.getAbsolutePath();
+	    
 	    String volume = null;
 	    String root = null;
 
@@ -220,11 +226,14 @@ public Path fileToPath(File path) {
 	            root = nextPath;
 	        }
 	    }
+	  
+	    if(volume==null){
+	        throw new RuntimeException("No volume matching path: " + path);
+	    }
 
 	    if(default_volume.equalsIgnoreCase(volume))
 	        volume = "";
-	    
-        return new Path("glusterfs://" + volume + "/" + rawPath.substring(root.length()));
+	    return new Path("glusterfs://" + volume + "/" + rawPath.substring(root.length()));
      }
 
      public boolean rename(Path src, Path dst) throws IOException {
@@ -280,6 +289,10 @@ public FileStatus[] listStatus(Path f) throws IOException {
           return new FileStatus[] {
             new GlusterFileStatus(localf, getDefaultBlockSize(), this) };
         }
+        
+        if(localf.isDirectory() && !localf.canRead()){
+            throw new IOException("Access denied : " + localf.getPath());
+        }
 
         File[] names = localf.listFiles();
         if (names == null) {
@@ -292,8 +305,7 @@ public FileStatus[] listStatus(Path f) throws IOException {
             results[j] = getFileStatus(fileToPath(names[i]));
             j++;
           } catch (FileNotFoundException e) {
-            // ignore the files not found since the dir list may have have changed
-            // since the names[] list was generated.
+        	  log.info("ignoring invisible path :  " + names[i]);
           }
         }
         if (j == names.length) {

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

@@ -4,23 +4,32 @@
 
 import java.util.Properties;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Versioning stuff for the shim.  This class is not tested since there is no 
  * deterministic behaviour (i.e. it might not work if not building from binary), 
  * and the effects are pure side effects.
  */
 public class Version extends Properties{
+    static final Logger LOG = LoggerFactory.getLogger(Version.class);
     public Version() {
         super();
         try{
             load(this.getClass().getClassLoader().getResourceAsStream("git.properties"));
         }
         catch(Throwable t){
-            throw new RuntimeException("Couldn't find git properties for version info " + t.getMessage());
+            LOG.warn("Couldn't find GIT properties for version info " + 
+            t.getMessage()+".  This jar may have been built OUTSIDE a GIT repo.");
         }
     }
     public String getTag(){
-        return this.getProperty("git.commit.id.describe").split("-")[0];
+        String commit = this.getProperty("git.commit.id.describe"); 
+        String tag = commit != null ? 
+                commit.split("-")[0]:
+               "no version info available. check log warnings.";
+        return commit.split("-")[0];
     }
 
     /**

src/test/java/org/apache/hadoop/fs/test/unit/HcfsFileSystemTest.java

@@ -31,12 +31,16 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.Iterator;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.fs.test.connector.HcfsTestConnectorFactory;
@@ -45,7 +49,6 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -56,6 +59,26 @@ public class HcfsFileSystemTest{
 
     static FileSystem fs ; 
 
+
+    /**
+     * See MAPREDUCE-5902 for context on why this test is critical
+     * for ecosystem interoperability.
+     */
+    @org.junit.Test
+    public void testEncodedPaths() throws Exception {
+    	//FileSystem fs2 = FileSystem.getLocal(new Configuration());
+    	FileSystem fs2 = fs;
+    	Path encodedFiles=new Path("/tmp/encodedTest"+System.currentTimeMillis());
+    	fs2.mkdirs(encodedFiles);
+    	fs2.create(new Path(encodedFiles,"a"));
+    	fs2.create(new Path(encodedFiles,"a%2"));
+    	fs2.create(new Path(encodedFiles,"a%2a"));
+    	fs2.create(new Path(encodedFiles,"a%3a"));
+    	fs2.create(new Path(encodedFiles,"a%4a"));
+    	Assert.assertEquals(5, fs2.listStatus(encodedFiles).length);
+    	fs2.delete(encodedFiles);
+    }    
+    
     @BeforeClass
     public static void setup() throws Exception {
     	HcfsTestConnectorInterface connector = HcfsTestConnectorFactory.getHcfsTestConnector();