Merge pull request #34 from mattf/configurable-getfattrCmd-2

Configurable getfattr cmd, take 2

Author: mattf

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

@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 
 public class GlusterFSXattr{
@@ -42,10 +43,14 @@ public enum CMD {
 
     private static String hostname;
 
-    public GlusterFSXattr(){
+   private String getFattrCmdBase;
+
+    public GlusterFSXattr(Configuration conf) {
+       getFattrCmdBase=conf.get("fs.glusterfs.getfattrcmd",
+                                  "getfattr -m . -n trusted.glusterfs.pathinfo");
     }
 
-    public static String brick2host(String brick) throws IOException{
+    public String brick2host(String brick) throws IOException{
         String[] hf=null;
 
         hf=brick.split(":");
@@ -57,7 +62,7 @@ public static String brick2host(String brick) throws IOException{
         return hf[0];
     }
 
-    public static String brick2file(String brick) throws IOException{
+    public String brick2file(String brick) throws IOException{
         String[] hf=null;
 
         hf=brick.split(":");
@@ -69,7 +74,7 @@ public static String brick2file(String brick) throws IOException{
         return hf[1];
     }
 
-    public static BlockLocation[] getPathInfo(String filename,long start,long len) throws IOException{
+    public BlockLocation[] getPathInfo(String filename,long start,long len) throws IOException{
         HashMap<String, ArrayList<String>> vol=null;
         HashMap<String, Integer> meta=new HashMap<String, Integer>();
 
@@ -78,7 +83,7 @@ public static BlockLocation[] getPathInfo(String filename,long start,long len) t
         return getHints(vol, meta, start, len, null);
     }
 
-    public static long getBlockSize(String filename) throws IOException{
+    public long getBlockSize(String filename) throws IOException{
         HashMap<String, ArrayList<String>> vol=null;
         HashMap<String, Integer> meta=new HashMap<String, Integer>();
 
@@ -91,7 +96,7 @@ public static long getBlockSize(String filename) throws IOException{
 
     }
 
-    public static short getReplication(String filename) throws IOException{
+    public short getReplication(String filename) throws IOException{
         HashMap<String, ArrayList<String>> vol=null;
         HashMap<String, Integer> meta=new HashMap<String, Integer>();
 
@@ -101,7 +106,7 @@ public static short getReplication(String filename) throws IOException{
 
     }
 
-    public static TreeMap<Integer, GlusterFSBrickClass> quickIOPossible(String filename,long start,long len) throws IOException{
+    public TreeMap<Integer, GlusterFSBrickClass> quickIOPossible(String filename,long start,long len) throws IOException{
         String realpath=null;
         HashMap<String, ArrayList<String>> vol=null;
         HashMap<String, Integer> meta=new HashMap<String, Integer>();
@@ -117,7 +122,7 @@ public static TreeMap<Integer, GlusterFSBrickClass> quickIOPossible(String filen
         return hnts;
     }
 
-    public static HashMap<String, ArrayList<String>> execGetFattr(String filename,HashMap<String, Integer> meta,CMD cmd) throws IOException{
+    public HashMap<String, ArrayList<String>> execGetFattr(String filename,HashMap<String, Integer> meta,CMD cmd) throws IOException{
         Process p=null;
         BufferedReader brInput=null;
         String s=null;
@@ -135,7 +140,7 @@ public static HashMap<String, ArrayList<String>> execGetFattr(String filename,Ha
 
         HashMap<String, ArrayList<String>> vol=new HashMap<String, ArrayList<String>>();
 
-        getfattrCmd="getfattr -m . -n trusted.glusterfs.pathinfo "+filename;
+        getfattrCmd=this.getFattrCmdBase + " " + filename;
 
         p=Runtime.getRuntime().exec(getfattrCmd);
         brInput=new BufferedReader(new InputStreamReader(p.getInputStream()));
@@ -228,7 +233,7 @@ else if(enclosingXl.equalsIgnoreCase("distribute"))
         return vol;
     }
 
-    static BlockLocation[] getHints(HashMap<String, ArrayList<String>> vol,HashMap<String, Integer> meta,long start,long len,TreeMap<Integer, GlusterFSBrickClass> hnts) throws IOException{
+    BlockLocation[] getHints(HashMap<String, ArrayList<String>> vol,HashMap<String, Integer> meta,long start,long len,TreeMap<Integer, GlusterFSBrickClass> hnts) throws IOException{
         String brick=null;
         String key=null;
         boolean done=false;
@@ -430,7 +435,7 @@ else if(allocCtr<=stripedBricks.size()){
     }
 
     /* TODO: use meta{dcount,scount,rcount} for checking */
-    public static int getReplicationFromLayout(HashMap<String, ArrayList<String>> vol,HashMap<String, Integer> meta) throws IOException{
+    public int getReplicationFromLayout(HashMap<String, ArrayList<String>> vol,HashMap<String, Integer> meta) throws IOException{
         int replication=0;
         LAYOUT l=LAYOUT.valueOf(vol.get("layout").get(0));
 

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

@@ -140,7 +140,7 @@ public void initialize(URI uri,Configuration conf) throws IOException{
             this.workingDir=new Path(glusterMount);
             this.uri=URI.create(uri.getScheme()+"://"+uri.getAuthority());
 
-            this.xattr=new GlusterFSXattr();
+            this.xattr=new GlusterFSXattr(conf);
 
             InetAddress addr=InetAddress.getLocalHost();
             this.hostname=addr.getHostName();