Multiple volume unit test, along with a fix to remove canonicalization of the URI when not always desirable.

Author: childsb

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

@@ -92,8 +92,8 @@ protected URI canonicalizeUri(URI uri) {
 
     /* check if a path is on the same volume as this instance */
     public boolean sameVolume(Path p){
-        URI thisUri = canonicalizeUri(this.NAME);
-        URI thatUri = canonicalizeUri(p.toUri());
+        URI thisUri = this.NAME;
+        URI thatUri = p.toUri();
         if(!thatUri.getScheme().equalsIgnoreCase(thisUri.getScheme())) return false;
         if((thatUri.getAuthority()==null && thisUri.getAuthority()==null)) return true;
         return (thatUri.getAuthority()!=null && thatUri.getAuthority().equalsIgnoreCase(thisUri.getAuthority()));
@@ -179,7 +179,9 @@ public void setConf(Configuration conf){
     }
 
     public File pathToFile(Path path) {
+      
       if(path==null) return null;
+      
       checkPath(path);
 
       if (!path.isAbsolute()) {

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

@@ -0,0 +1,55 @@
+package org.apache.hadoop.fs.test.unit;
+
+import java.io.IOException;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.test.connector.HcfsTestConnectorFactory;
+import org.apache.hadoop.fs.test.connector.HcfsTestConnectorInterface;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GlusterMultipleVolumeTest {
+   
+    Logger log = LoggerFactory.getLogger(HCFSPerformanceIOTests.class);
+    static Configuration  config = null;
+    
+    
+    @BeforeClass
+    public static void setup() throws Exception {
+        HcfsTestConnectorInterface connector = HcfsTestConnectorFactory.getHcfsTestConnector();
+        config = connector.createConfiguration();
+    }
+   
+    public static FileSystem getFileSystem(Path p) throws IOException{
+        return FileSystem.get(p.toUri(), config);
+    }
+    
+    @Test
+    public void testDefaultPath() throws IOException{
+        Path p1 = new Path("glusterfs:///test1.txt");
+        Path p2 = new Path("glusterfs://gv0/test1.txt");
+        Path p3 = new Path("glusterfs://gv1/test1.txt");
+        
+        FileSystem fs1 = getFileSystem(p1);
+        FileSystem fs2 = getFileSystem(p2);
+        FileSystem fs3 = getFileSystem(p3);
+        fs1.create(p1);
+        
+        /* the gluster volume and default is based on configuration settings, but expected that default = gv0 */
+        Assert.assertTrue(fs1.exists(p1));
+        Assert.assertTrue(fs2.exists(p2));
+        Assert.assertFalse(fs3.exists(p3));
+        
+        fs1.delete(p1);
+    }
+
+    
+}