Modified: hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java?rev=1077108&r1=1077107&r2=1077108&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java Fri Mar 4 03:41:31 2011 @@ -62,6 +62,7 @@ import org.apache.hadoop.mapred.OutputCo import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.SequenceFileRecordReader; +import org.apache.hadoop.mapreduce.JobSubmissionFiles; import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; @@ -1003,7 +1004,13 @@ public class DistCp implements Tool { final String randomId = getRandomId(); JobClient jClient = new JobClient(jobConf); - Path jobDirectory = new Path(jClient.getSystemDir(), NAME + "_" + randomId); + Path stagingArea; + stagingArea = JobSubmissionFiles.getStagingDir(jClient, conf); + + Path jobDirectory = new Path(stagingArea + NAME + "_" + randomId); + FsPermission mapredSysPerms = + new FsPermission(JobSubmissionFiles.JOB_DIR_PERMISSION); + FileSystem.mkdirs(jClient.getFs(), jobDirectory, mapredSysPerms); jobConf.set(JOB_DIR_LABEL, jobDirectory.toString()); FileSystem dstfs = args.dst.getFileSystem(conf);
Modified: hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=1077108&r1=1077107&r2=1077108&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java Fri Mar 4 03:41:31 2011 @@ -38,6 +38,7 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.HarFileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.SequenceFile; @@ -56,6 +57,7 @@ import org.apache.hadoop.mapred.Reducer; import org.apache.hadoop.mapred.SequenceFileRecordReader; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.lib.NullOutputFormat; +import org.apache.hadoop.mapreduce.JobSubmissionFiles; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; @@ -359,8 +361,15 @@ public class HadoopArchives implements T } conf.set(DST_DIR_LABEL, outputPath.toString()); final String randomId = DistCp.getRandomId(); - Path jobDirectory = new Path(new JobClient(conf).getSystemDir(), - NAME + "_" + randomId); + Path stagingArea; + stagingArea = JobSubmissionFiles.getStagingDir(new JobClient(conf), + conf); + Path jobDirectory = new Path(stagingArea, + NAME + "_" + randomId); + FsPermission mapredSysPerms = + new FsPermission(JobSubmissionFiles.JOB_DIR_PERMISSION); + FileSystem.mkdirs(jobDirectory.getFileSystem(conf), jobDirectory, + mapredSysPerms); conf.set(JOB_DIR_LABEL, jobDirectory.toString()); //get a tmp directory for input splits FileSystem jobfs = jobDirectory.getFileSystem(conf); Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp?rev=1077108&r1=1077107&r2=1077108&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/analysejobhistory.jsp Fri Mar 4 03:41:31 2011 @@ -24,7 +24,7 @@ showTasks = Integer.parseInt(numTasks); } FileSystem fs = (FileSystem) application.getAttribute("fileSys"); - JobInfo job = JSPUtil.getJobInfo(request, fs); + JobHistory.JobInfo job = JSPUtil.getJobInfo(request, fs); %> <h2>Hadoop Job <a href="jobdetailshistory.jsp?jobid=<%=jobid%>&&logFile=<%=encodedLogFileName%>"><%=jobid %> </a></h2> <b>User : </b> <%=job.get(Keys.USER) %><br/> Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp?rev=1077108&r1=1077107&r2=1077108&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobdetailshistory.jsp Fri Mar 4 03:41:31 2011 @@ -21,7 +21,7 @@ String jobUniqueString = jobDetails[0] + "_" +jobDetails[1] + "_" + jobid ; FileSystem fs = (FileSystem) application.getAttribute("fileSys"); - JobInfo job = JSPUtil.getJobInfo(request, fs); + JobHistory.JobInfo job = JSPUtil.getJobInfo(request, fs); %> <html> Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp?rev=1077108&r1=1077107&r2=1077108&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/jobtaskshistory.jsp Fri Mar 4 03:41:31 2011 @@ -23,7 +23,7 @@ String taskType = request.getParameter("taskType"); FileSystem fs = (FileSystem) application.getAttribute("fileSys"); - JobInfo job = JSPUtil.getJobInfo(request, fs); + JobHistory.JobInfo job = JSPUtil.getJobInfo(request, fs); Map<String, JobHistory.Task> tasks = job.getAllTasks(); %> <html> Modified: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp?rev=1077108&r1=1077107&r2=1077108&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/taskdetailshistory.jsp Fri Mar 4 03:41:31 2011 @@ -18,7 +18,7 @@ String encodedLogFileName = JobHistory.JobInfo.encodeJobHistoryFilePath(logFile); String taskid = request.getParameter("taskid"); FileSystem fs = (FileSystem) application.getAttribute("fileSys"); - JobInfo job = JSPUtil.getJobInfo(request, fs); + JobHistory.JobInfo job = JSPUtil.getJobInfo(request, fs); JobHistory.Task task = job.getAllTasks().get(taskid); String type = task.get(Keys.TASK_TYPE); %>
