added additional staging heuristic for hadopo 2.x

Author: childsb

conf/mapred-site.xml

@@ -16,6 +16,16 @@
     <name>mapred.system.dir</name>
     <value>glusterfs:///mapred/system</value>
   </property>
+  <property>
+    <name>mapreduce.jobhistory.done-dir</name>
+    <value>glusterfs:///job-history/done</value>
+  </property>
+  
+  <property>
+    <name>mapreduce.jobhistory.intermediate-done-dir</name>
+    <value>glusterfs:///job-history/intermediate-done</value>
+  </property>
+  
   <property>
     <name>mapreduce.jobtracker.staging.root.dir</name>
     <value>glusterfs:///user</value>

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

@@ -24,7 +24,7 @@ public AclPathFilter(Configuration conf){
 		} catch (IOException e) {
 
 		}
-		String stagingRootDir = new Path(conf.get("mapreduce.jobtracker.staging.root.dir", "/tmp/hadoop/mapred/staging")).toString();
+		String stagingRootDir = new Path(conf.get("yarn.app.mapreduce.am.staging-dir",conf.get("mapreduce.jobtracker.staging.root.dir", "/tmp/hadoop/mapred/staging"))).toString();
 		String user;
 		String randid = "\\d*";
 		if (ugi != null) {
@@ -33,8 +33,10 @@ public AclPathFilter(Configuration conf){
 		    user = "dummy";
 		}
 		paths.add("^" + new Path(stagingRootDir, user +  randid +"/.staging").toString() + ".*");
+		paths.add("^" + (new Path(stagingRootDir, user +  randid +"/.staging")).toUri().getPath() + ".*");
 		stagingRootDir = new Path(conf.get("mapreduce.jobtracker.staging.root.dir","/tmp/hadoop/mapred/staging")).toString();
         paths.add("^" + new Path(stagingRootDir, user+"/.staging").toString() + ".*");
+        paths.add("^" + (new Path(stagingRootDir, user+"/.staging")).toUri().getPath() + ".*");
 
 	}