HBASE-6455 org.apache.hadoop.hbase.PerformanceEvaluation sets the map reduce output path as a child of input path (Aditya)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1366034 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1eaed9925b
commit
a5bd687531
|
@ -316,6 +316,9 @@ public class PerformanceEvaluation {
|
|||
List<InputSplit> splitList = new ArrayList<InputSplit>();
|
||||
|
||||
for (FileStatus file: listStatus(job)) {
|
||||
if (file.isDir()) {
|
||||
continue;
|
||||
}
|
||||
Path path = file.getPath();
|
||||
FileSystem fs = path.getFileSystem(job.getConfiguration());
|
||||
FSDataInputStream fileIn = fs.open(path);
|
||||
|
@ -644,7 +647,7 @@ public class PerformanceEvaluation {
|
|||
job.setNumReduceTasks(1);
|
||||
|
||||
job.setOutputFormatClass(TextOutputFormat.class);
|
||||
TextOutputFormat.setOutputPath(job, new Path(inputDir,"outputs"));
|
||||
TextOutputFormat.setOutputPath(job, new Path(inputDir.getParent(), "outputs"));
|
||||
|
||||
TableMapReduceUtil.addDependencyJars(job);
|
||||
// Add a Class from the hbase.jar so it gets registered too.
|
||||
|
@ -663,14 +666,14 @@ public class PerformanceEvaluation {
|
|||
* @throws IOException
|
||||
*/
|
||||
private Path writeInputFile(final Configuration c) throws IOException {
|
||||
FileSystem fs = FileSystem.get(c);
|
||||
if (!fs.exists(PERF_EVAL_DIR)) {
|
||||
fs.mkdirs(PERF_EVAL_DIR);
|
||||
}
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
|
||||
Path subdir = new Path(PERF_EVAL_DIR, formatter.format(new Date()));
|
||||
fs.mkdirs(subdir);
|
||||
Path inputFile = new Path(subdir, "input.txt");
|
||||
Path jobdir = new Path(PERF_EVAL_DIR, formatter.format(new Date()));
|
||||
Path inputDir = new Path(jobdir, "inputs");
|
||||
|
||||
FileSystem fs = FileSystem.get(c);
|
||||
fs.mkdirs(inputDir);
|
||||
|
||||
Path inputFile = new Path(inputDir, "input.txt");
|
||||
PrintStream out = new PrintStream(fs.create(inputFile));
|
||||
// Make input random.
|
||||
Map<Integer, String> m = new TreeMap<Integer, String>();
|
||||
|
@ -695,7 +698,7 @@ public class PerformanceEvaluation {
|
|||
} finally {
|
||||
out.close();
|
||||
}
|
||||
return subdir;
|
||||
return inputDir;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue