Merge pull request #56 from childsb/master

create mapred system directory if not exists + some code cleanup

Author: childsb

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

@@ -43,36 +43,15 @@
 public class GlusterFileSystem extends FilterFileSystem{
 
     protected static final Logger log=LoggerFactory.getLogger(GlusterFileSystem.class);
-    FileSystem rfs;
-    String swapScheme;
-
-    public FileSystem getRaw(){
-        return rfs;
-    }
-
-    public void initialize(URI name,Configuration conf) throws IOException{
-        if(fs.getConf()==null){
-            fs.initialize(name, conf);
-        }
-        String scheme=name.getScheme();
-        if(!scheme.equals(fs.getUri().getScheme())){
-            swapScheme=scheme;
-        }
-    }
-
+   
     public GlusterFileSystem(){
-        this(new GlusterVolume());
+        super(new GlusterVolume());
         Version v=new Version();
         log.info("Initializing GlusterFS,  CRC disabled.");
         log.info("GIT INFO="+v);
         log.info("GIT_TAG="+v.getTag());
     }
 
-    public GlusterFileSystem(FileSystem rawLocalFileSystem){
-        super(rawLocalFileSystem);
-        rfs=rawLocalFileSystem;
-    }
-
     /** Convert a path to a File. */
     public File pathToFile(Path path){
         return ((GlusterVolume) fs).pathToFile(path);

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

@@ -66,6 +66,18 @@ public void setConf(Configuration conf){
                 }else{
                 	attr = new GlusterFSXattr();
                 }
+                String jtSysDir = conf.get("mapreduce.jobtracker.system.dir", null);
+                Path mapredSysDirectory = null;
+                
+                if(jtSysDir!=null)
+                    mapredSysDirectory = new Path(jtSysDir);
+                else{
+                    mapredSysDirectory = new Path(conf.get("mapred.system.dir", "glusterfs:///mapred/system"));
+                }
+                
+                if(!exists(mapredSysDirectory)){
+                    mkdirs(mapredSysDirectory);
+                }
 
                 //volName=conf.get("fs.glusterfs.volname", null);
                 //remoteGFSServer=conf.get("fs.glusterfs.server", null);

src/main/java/org/apache/hadoop/fs/local/GlusterVol.java

@@ -14,11 +14,9 @@
 import org.slf4j.LoggerFactory;
 
 public class GlusterVol extends RawLocalFsG{
-    
-    protected String glusterMount = null;
+   
     protected static final Logger log = LoggerFactory.getLogger(GlusterFileSystemCRC.class);
 
-    
     GlusterVol(final Configuration conf) throws IOException, URISyntaxException {
         this(GlusterVolume.NAME, conf);
 

src/main/java/org/apache/hadoop/fs/local/RawLocalFsG.java

@@ -23,8 +23,8 @@ public class RawLocalFsG extends DelegateToFileSystem{
      * 
      */
 
-    RawLocalFsG(final URI theUri, final FileSystem fs, final Configuration conf,boolean myMamaFat) throws IOException, URISyntaxException{
-        super(theUri, fs, conf, theUri.getScheme(), myMamaFat);
+    RawLocalFsG(final URI theUri, final FileSystem fs, final Configuration conf,boolean authorityRequired) throws IOException, URISyntaxException{
+        super(theUri, fs, conf, theUri.getScheme(), authorityRequired);
     }