Working Directory patch to force hadoop < 1.2 to use /user/{user.name}/ as starting working dir instead of {user.dir}

Also some minor logging updates.

Author: jayunit100

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

@@ -49,7 +49,8 @@ public class GlusterVolume extends RawLocalFileSystem{
 
     protected static GlusterFSXattr attr = null;
 
-    public GlusterVolume(){}
+    public GlusterVolume(){
+    }
 
     public GlusterVolume(Configuration conf){
         this();
@@ -65,6 +66,7 @@ public void setConf(Configuration conf){
 
             try{
                 root=conf.get("fs.glusterfs.mount", null);
+                log.info("Root of Gluster file system is " + root);
                 getfattrcmd = conf.get("fs.glusterfs.getfattrcmd", null);
                 if(getfattrcmd!=null){
                 	attr = new GlusterFSXattr(getfattrcmd);
@@ -85,13 +87,18 @@ public void setConf(Configuration conf){
                 }
 
                 superUser =  conf.get("gluster.daemon.user", null);
+                log.info("Gluster Daemon for ACLs is: " + superUser);
 
                 aclFilter = new AclPathFilter(conf);
 
                 /* ensure the initial working directory exists */
-                Path workingDirectory = getInitialWorkingDirectory();
+                final Path workingDirectory = getInitialWorkingDirectory();
                 mkdirs(workingDirectory);
+                //For hadoop < 1.2.0, when RawLocalFileSystem used 
+                //user.dir instead of user.home
+                setWorkingDirectory(workingDirectory);
 
+                log.info("Working directory is : "+ getWorkingDirectory());
                 //volName=conf.get("fs.glusterfs.volname", null);
                 //remoteGFSServer=conf.get("fs.glusterfs.server", null);
 
@@ -110,7 +117,10 @@ public File pathToFile(Path path) {
       return new File(root + path.toUri().getPath());
     }
 
-    @Override
+    /**
+     * Note this method doesn't override anything in hadoop 1.2.0 and 
+     * below.
+     */
     protected Path getInitialWorkingDirectory() {
 		/* apache's unit tests use a default working direcotry like this: */
        return new Path(this.NAME + "user/" + System.getProperty("user.name"));

src/test/java/org/apache/hadoop/fs/test/unit/HCFSTestWorkingDir.java

@@ -0,0 +1,60 @@
+package org.apache.hadoop.fs.test.unit;
+
+import static org.apache.hadoop.fs.FileSystemTestHelper.getTestRootPath;
+
+import java.io.File;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.test.connector.HcfsTestConnectorFactory;
+import org.apache.hadoop.fs.test.connector.HcfsTestConnectorInterface;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HCFSTestWorkingDir{
+
+    Logger log = LoggerFactory.getLogger(HCFSTestWorkingDir.class);
+    FileSystem fSys;
+
+    @Before
+    public void setUp() throws Exception{
+        HcfsTestConnectorInterface connector=
+                HcfsTestConnectorFactory.getHcfsTestConnector();
+        fSys=connector.create();
+    }
+
+    /**
+     * This test fails in hadoop 1.2.0, if we do not have
+     * logic in the GlusterVolume to use "getInitialWorkingDirectory" 
+     * as the starting working directory.  
+     */
+    @Test
+    public void test() throws Exception {
+        Path outpath = new Path("to_");
+        if(fSys.exists(outpath)){
+            fSys.delete(outpath,true);
+        }
+        File tmpfile = new File("/tmp/test_copyfromlocal");
+        tmpfile.createNewFile();
+        log.info(tmpfile.getAbsolutePath());
+        Assert.assertTrue(tmpfile.exists());
+        
+        fSys.copyFromLocalFile(false,  false, 
+                new Path(tmpfile.getPath()), 
+                outpath);
+     
+        Assert.assertTrue(fSys.exists(outpath));
+        fSys.delete(outpath,true);
+    }
+    
+    @After
+    public void tearDown() throws Exception{
+        fSys.delete(getTestRootPath(fSys, "test"), true);
+    }
+}