Rework of the JUNIT code. Creates HCFS test framework and testing harnace to easily replace the basic FileSystem implementer that the unit tests run against.

To test o.a.h.f.FileSystem based class, create a class that implements o.a.h.h.t.c.HcfsTestConnectorInterface.  The test connector allows for non-standard configuration and instantiation of the FileSytem.  If a file system doesn't need additional configuration, then the default HcfsTestConnector class can be used, and the FileSystem classname given in the HCFS_CLASSNAME env variable.

Next, set these environment variables:

export HCFS_FILE_SYSTEM_CONNECTOR=org.apache.hadoop.hcfs.test.connector.glusterfs.GlusterFileSystemTestConnector
export HCFS_CLASSNAME=org.apache.hadoop.fs.glusterfs.GlusterFileSystem

Finall, run the tests.

This is demonstrated for both of the GlusterFileSystem classes in the test.sh script.  ((the pre-mounted gluster volume must also be specified for glusterfs)).

Author: childsb

README

@@ -100,7 +100,7 @@ CONFIGURATION
          The default FileSystem API to use (there is little reason to modify this).
 
   name:  fs.default.name
-  value: glusterfs://server:port
+  value: glusterfs:///
 
          The default name that hadoop uses to represent file as a URI (typically a server:port tuple). Use any host
          in the cluster as the server and any port number. This option has to be in server:port format for hadoop
@@ -115,10 +115,10 @@ CONFIGURATION
   name:  fs.glusterfs.mount
   value: /mnt/glusterfs
 
-         This is the directory that the plugin will use to mount (FUSE mount) the volume.
+         This is the directory where the gluster volume is mounted
 
   name:  fs.glusterfs.server
-  value: 192.168.1.36, hackme.zugzug.org
+  value: localhost
 
          To mount a volume the plugin needs to know the hostname or the IP of a GlusterFS server in the cluster.
          Mention it here.
@@ -180,8 +180,9 @@ The unit tests read test resources from glusterconfig.properties - a file which
 
 1) edit your .bashrc, or else at your terminal run : 
 
-export GLUSTER_VOLUME=MyVolume <-- replace with your preferred volume name (default is HadoopVol)
-export GLUSTER_HOST=192.0.1.2 <-- replace with your host (default will be determined at runtime in the JVM)
+export GLUSTER_MOUNT=/mnt/glusterfs
+export HCFS_FILE_SYSTEM_CONNECTOR=org.apache.hadoop.hcfs.test.connector.glusterfs.GlusterFileSystemTestConnector
+export HCFS_CLASSNAME=org.apache.hadoop.fs.glusterfs.GlusterFileSystem
 
 2) run: 
    mvn package

pom.xml

@@ -50,18 +50,24 @@
                 <version>2.14</version>
 		<configuration>
 			<!--  
-				run "export GLUSTER_HOST=192.X.X.1
-				     export GLUSTER_VOLUME=volname" 
+				run "export GLUSTER_MOUNT=/mnt/glusterfs
+				     export HCFS_FILE_SYSTEM_CONNECTOR=org.gluster.test.GlusterFileSystemTestConnector
+				     export HCFS_CLASSNAME=org.apache.hadoop.fs.glusterfs.GlusterFileSystem" 
 			-->
 		    <systemProperties>
 				          <property>
-				             <name>GLUSTER_HOST</name>
-				             <value>${GLUSTER_HOST}</value>
+				             <name>GLUSTER_MOUNT</name>
+				             <value>${GLUSTER_MOUNT}</value>
 				          </property>
-				           <property>
-				             <name>GLUSTER_VOLUME</name>
-				             <value>${GLUSTER_VOLUME}</value>
+				          <property>
+				             <name>HCFS_CLASSNAME</name>
+				             <value>${HCFS_CLASSNAME}</value>
+				          </property>
+				          <property>
+				             <name>HCFS_FILE_SYSTEM_CONNECTOR</name>
+				             <value>${HCFS_FILE_SYSTEM_CONNECTOR}</value>
 				          </property>
+				          
 			</systemProperties>
 		 </configuration>
  	 </plugin>

src/test/java/org/apache/hadoop/hcfs/test/connector/HcfsTestConnector.java

@@ -0,0 +1,33 @@
+package org.apache.hadoop.hcfs.test.connector;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+
+/*
+ * Generic HCFS file system test connector.
+ * This test connector takes a fully qualified o.a.h.f.FileSystem implementor class 
+ * as an environment variable.
+ * 
+ */
+public class HcfsTestConnector implements HcfsTestConnectorInterface{
+	 
+	public Configuration createConfiguration(){
+		return new Configuration();
+	}
+	   
+    public FileSystem create(String HcfsClassName) throws IOException{
+    	try {
+    		FileSystem hcfs = (FileSystem)Class.forName(HcfsClassName).newInstance();
+			hcfs.initialize(hcfs.getUri(), createConfiguration());
+			return hcfs;
+		} catch (Exception e) {
+			throw new RuntimeException("Cannont instatiate HCFS. Error:\n " + e);
+		} 
+	}
+
+	public FileSystem create() throws IOException {
+		return create(System.getProperty("HCFS_CLASSNAME"));
+	}
+}

src/test/java/org/apache/hadoop/hcfs/test/connector/HcfsTestConnectorFactory.java

@@ -0,0 +1,20 @@
+package org.apache.hadoop.hcfs.test.connector;
+
+
+public class HcfsTestConnectorFactory {
+
+	/* Loads an HCFS file system adapter via environment variable */
+	public static HcfsTestConnectorInterface getHcfsTestConnector() throws RuntimeException{
+		return getHcfsTestConnector(System.getProperty("HCFS_FILE_SYSTEM_CONNECTOR"));
+	}
+	
+	public static HcfsTestConnectorInterface getHcfsTestConnector(String hcfsName) throws RuntimeException{
+		try {
+			return (HcfsTestConnectorInterface)Class.forName(hcfsName).newInstance();
+		} catch (Exception e) {
+			throw new RuntimeException("Cannont instatiate HCFS File System from HCFS_FILE_SYSTEM env variable. Error:\n " + e);
+		} 
+	
+	}
+	
+}

src/test/java/org/apache/hadoop/hcfs/test/connector/HcfsTestConnectorInterface.java

@@ -0,0 +1,19 @@
+package org.apache.hadoop.hcfs.test.connector;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+
+
+/* generic interface for creating HCFS file sytems for testing purposes */
+
+public interface HcfsTestConnectorInterface {
+	
+	/* return a fully configured instantiated file system for testing */
+	public  FileSystem create() throws IOException;
+	
+	/* returns a configuration file with properties for a given FS */
+	public Configuration createConfiguration();
+
+}

src/test/java/org/apache/hadoop/hcfs/test/connector/glusterfs/GlusterFileSystemTestConnector.java

@@ -0,0 +1,19 @@
+package org.apache.hadoop.hcfs.test.connector.glusterfs;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hcfs.test.connector.HcfsTestConnector;
+
+/**
+ * A HCFS test connector specifically for instantiation and testing Glusterfs.
+ */
+public class GlusterFileSystemTestConnector extends HcfsTestConnector{
+ 
+	public Configuration createConfiguration(){
+		Configuration c = super.createConfiguration();
+		c.set("fs.glusterfs.mount",System.getProperty("GLUSTER_MOUNT"));
+		c.set("fs.glusterfs.impl","org.apache.hadoop.fs.local.GlusterFs");
+		c.set("fs.default.name","glusterfs:///");
+		return c;
+	}
+
+}

src/test/java/org/gluster/test/TestGlusterFileSystemContract.java renamed to src/test/java/org/apache/hadoop/hcfs/test/unit/HcfsFileSystemContractBaseTest.java

@@ -16,24 +16,27 @@
  *  limitations under the License.
  */
 
-package org.gluster.test;
+package org.apache.hadoop.hcfs.test.unit;
 
 import java.io.IOException;
 
 import org.apache.hadoop.fs.FileSystemContractBaseTest;
+import org.apache.hadoop.hcfs.test.connector.HcfsTestConnectorFactory;
+import org.apache.hadoop.hcfs.test.connector.HcfsTestConnectorInterface;
 import org.slf4j.LoggerFactory;
 
 /**
  * This is the full filesystem contract test -which requires the
  * Default config set up to point to a filesystem
  */
-public class TestGlusterFileSystemContract
+public class HcfsFileSystemContractBaseTest
   extends FileSystemContractBaseTest {
-  private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(TestGlusterFileSystemContract.class);
+  private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(HcfsFileSystemContractBaseTest.class);
 
   @Override
   protected void setUp() throws Exception{
-      fs=GFSUtil.create(true);
+	  HcfsTestConnectorInterface connector = HcfsTestConnectorFactory.getHcfsTestConnector();
+      fs=connector.create();
       super.setUp();
   }