Merge pull request #30 from gluster/KEEPME_BZ_927415

quick.slave.io feature removal

Author: jayunit100

README

@@ -123,17 +123,6 @@ CONFIGURATION
          To mount a volume the plugin needs to know the hostname or the IP of a GlusterFS server in the cluster.
          Mention it here.
 
-  name:  quick.slave.io
-  value: [On/Off], [Yes/No], [1/0]
-
-         NOTE: This option is not tested as of now.
-
-         This is a performance tunable option. Hadoop schedules jobs to hosts that contain the file data part. The job
-         then does I/O on the file (via FUSE in case of GlusterFS). When this option is set, the plugin will try to
-         do I/O directly from the backed filesystem (ext3, ext4 etc..) the file resides on. Hence read performance
-         will improve and job would run faster.
-
-
 USAGE
 -----
 
@@ -152,7 +141,7 @@ FOR HACKERS
 
 org.apache.hadoop.fs.glusters/GlusterFSBrickClass.java
 org.apache.hadoop.fs.glusters/GlusterFSXattr.java            <--- Fetch/Parse Extended Attributes of a file
-org.apache.hadoop.fs.glusters/GlusterFUSEInputStream.java    <--- Input Stream (instantiated during open() calls; quick read from backed FS)
+org.apache.hadoop.fs.glusters/GlusterFUSEInputStream.java    <--- Input Stream (instantiated during open() calls; 
 org.apache.hadoop.fs.glusters/GlusterFSBrickRepl.java
 org.apache.hadoop.fs.glusters/GlusterFUSEOutputStream.java   <--- Output Stream (instantiated during creat() calls)
 org.apache.hadoop.fs.glusters/GlusterFileSystem.java         <--- Entry Point for the plugin (extends Hadoop FileSystem class)

conf/core-site.xml

@@ -30,11 +30,6 @@
     <value>RHS-1</value>
   </property>
 
-  <property>
-    <name>quick.slave.io</name>
-    <value>Off</value>
-  </property>
-
   <property>
   <name>fs.glusterfs.write.buffer.size</name>
   <value>1024</value>

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

@@ -68,9 +68,6 @@ public class GlusterFileSystem extends FileSystem{
     private int writeBufferSize = 0;
 
 
-    /* for quick IO */
-    private boolean quickSlaveIO=false;
-
     /* extended attribute class */
     private GlusterFSXattr xattr=null;
 
@@ -110,7 +107,6 @@ public void initialize(URI uri,Configuration conf) throws IOException{
         boolean ret=false;
         String volName=null;
         String remoteGFSServer=null;
-        String needQuickRead=null;
         boolean autoMount=true;
 
 
@@ -123,7 +119,6 @@ public void initialize(URI uri,Configuration conf) throws IOException{
             volName=conf.get("fs.glusterfs.volname", null);
             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);
             writeBufferSize = conf.getInt("fs.glusterfs.write.buffer.size", 0);
             LOG.info("Gluster Output Buffering size configured to " + writeBufferSize + " bytes.");
@@ -139,8 +134,6 @@ public void initialize(URI uri,Configuration conf) throws IOException{
                     throw new RuntimeException("Initialize: Failed to mount GlusterFS ");
                 }
             }
-            if((needQuickRead.length()!=0)&&(needQuickRead.equalsIgnoreCase("yes")||needQuickRead.equalsIgnoreCase("on")||needQuickRead.equals("1")))
-                this.quickSlaveIO=true;
 
             this.mounted=true;
             this.glusterFs=FileSystem.getLocal(conf);
@@ -446,8 +439,6 @@ public FSDataOutputStream create(Path path,FsPermission permission,boolean overw
      * open the file in read mode (internally the file descriptor is an instance
      * of InputStream class).
      * 
-     * if quick read mode is set then read the file by by-passing FUSE if we are
-     * on same slave where the file exist
      */
     public FSDataInputStream open(Path path) throws IOException{
         Path absolute=makeAbsolute(path);
@@ -458,9 +449,6 @@ public FSDataInputStream open(Path path) throws IOException{
         if(!f.exists())
             throw new IOException("File "+f.getPath()+" does not exist.");
 
-        if(quickSlaveIO)
-            hnts=xattr.quickIOPossible(f.getPath(), 0, f.length());
-
         glusterFileStream=new FSDataInputStream(new GlusterFUSEInputStream(f, hnts, hostname));
         return glusterFileStream;
     }

src/test/java/org/gluster/test/TestGluster.java

@@ -130,7 +130,6 @@ public static void before() throws Exception{
         conf.set("fs.glusterfs.mount", mount.getAbsolutePath());
         conf.set("fs.glusterfs.server", glusterHost);
         conf.set("fs.default.name", "glusterfs://"+glusterHost+":9000");
-        conf.set("quick.slave.io", "true");
         System.out.println("server "+conf.get("fs.glusterfs.server"));
         gfs.initialize(temp.toURI(), conf);
     }