Merge pull request #47 from childsb/master

(Raw)LocalFileSystem inheritance

Author: childsb

.gitignore

@@ -1,3 +1,4 @@
+src/main/resources/git.properties
 target/
 .project
 .classpath

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

@@ -49,7 +49,6 @@ public boolean isChunked(){
 
     public String brickIsLocal(String hostname){
         String path=null;
-        File f=null;
         if(host.equals(hostname))
             path=exportedFile;
 

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

@@ -19,8 +19,6 @@
 
 package org.apache.hadoop.fs.glusterfs;
 
-import java.io.*;
-
 public class GlusterFSBrickRepl{
     private String[] replHost;
     private long start;

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

@@ -19,16 +19,16 @@
 
 package org.apache.hadoop.fs.glusterfs;
 
-import java.net.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.io.*;
-import java.util.HashMap;
-import java.util.TreeMap;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 
 public class GlusterFSXattr{
@@ -43,13 +43,16 @@ public enum CMD {
 
     private static String hostname;
 
-   private String getFattrCmdBase;
-
-    public GlusterFSXattr(Configuration conf) {
-       getFattrCmdBase=conf.get("fs.glusterfs.getfattrcmd",
-                                  "getfattr -m . -n trusted.glusterfs.pathinfo");
-    }
-
+   private String getFattrCmdBase = null;
+   
+   public GlusterFSXattr(String getAttr) {
+       getFattrCmdBase=getAttr;
+   }
+  
+   public GlusterFSXattr(){
+	   getFattrCmdBase = "sudo getfattr -m . -n trusted.glusterfs.pathinfo";
+   }
+   
     public String brick2host(String brick) throws IOException{
         String[] hf=null;
 
@@ -456,4 +459,4 @@ public int getReplicationFromLayout(HashMap<String, ArrayList<String>> vol,HashM
 
         return replication;
     }
-}
+}