big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-2463. Job history files are not moved to done folder when job history location is hdfs. Contributed by Devaraj K

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1151722 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2011-07-28 04:08:34 +00:00
parent ffbe9e5972
commit 60c41c55e7
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mapreduce/CHANGES.txt
View File

@ -359,6 +359,9 @@ Trunk (unreleased changes)
MAPREDUCE-2732. Remove directly accessing FSNamesystem.LOG from
TestCopyFiles and TestDistCh. (szetszwo)
MAPREDUCE-2463. Job history files are not moved to done folder when job
history location is hdfs. (Devaraj K via szetszwo)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

4
mapreduce/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
View File

@ -43,6 +43,7 @@
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.mapred.JobConf;
@ -354,7 +355,8 @@ private void moveToDoneNow(Path fromPath, Path toPath) throws IOException {
if (logDirFs.exists(fromPath)) {
LOG.info("Moving " + fromPath.toString() + " to " +
toPath.toString());
doneDirFs.moveFromLocalFile(fromPath, toPath);
FileUtil.copy(logDirFs, fromPath, doneDirFs, toPath, true, false,
jobTracker.getConf());
doneDirFs.setPermission(toPath,
new FsPermission(JobHistory.HISTORY_FILE_PERMISSION));
}

37
mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJobHistory.java
View File

@ -76,6 +76,11 @@ public class TestJobHistory extends TestCase {
private static String TEST_ROOT_DIR = new File(System.getProperty(
"test.build.data", "/tmp")).toURI().toString().replace(' ', '+');
private static final String LOG_DIR = System.getProperty("hadoop.log.dir");
private static final String LOCAL_LOG_DIR_URI = new File(LOG_DIR).toURI()
.toString().replace(' ', '+') + "/history";
private static final String DIGITS = "[0-9]+";
@ -607,15 +612,32 @@ public static void validateJobHistoryFileContent(MiniMRCluster mr,
assertTrue(jobInfo.getJobQueueName().equals(conf.getQueueName()));
}
/**
* Tests the case where the log directory is on local disk, the done folder is on HDFS,
* and the default FS is local.
*/
public void testDoneFolderOnHDFS() throws IOException, InterruptedException {
runDoneFolderTest("history_done");
runDoneFolderTest("history_done", LOCAL_LOG_DIR_URI);
}
/**
* Tests the case where the log directory and done folder is on local disk
* and the default FS is local.
*/
public void testDoneFolderNotOnDefaultFileSystem() throws IOException, InterruptedException {
runDoneFolderTest("file://" + System.getProperty("test.build.data", "tmp") + "/history_done");
runDoneFolderTest(TEST_ROOT_DIR + "/history_done", LOCAL_LOG_DIR_URI);
}
/**
* Tests the case where the log directory is on HDFS and done folder is on local disk
* and the default FS is local.
*/
public void testHistoryFolderOnHDFS() throws IOException, InterruptedException {
String logDir = "hdfs://localhost:%d/history";
runDoneFolderTest(TEST_ROOT_DIR + "/done", logDir);
}
private void runDoneFolderTest(String doneFolder) throws IOException, InterruptedException {
private void runDoneFolderTest(String doneFolder, String historyFolder) throws IOException, InterruptedException {
MiniMRCluster mr = null;
MiniDFSCluster dfsCluster = null;
try {
@ -627,9 +649,11 @@ private void runDoneFolderTest(String doneFolder) throws IOException, Interrupte
//set the done folder location
conf.set(JTConfig.JT_JOBHISTORY_COMPLETED_LOCATION, doneFolder);
String logDir =
"file:///" + new File(System.getProperty("hadoop.log.dir")).
getAbsolutePath() + File.separator + "history";
dfsCluster = new MiniDFSCluster(conf, 2, true, null);
String logDir = String.format(historyFolder, dfsCluster.getNameNodePort());
//set the history folder location
conf.set(JTConfig.JT_JOBHISTORY_LOCATION, logDir);
Path logDirPath = new Path(logDir);
FileSystem logDirFs = logDirPath.getFileSystem(conf);
@ -647,7 +671,6 @@ private void runDoneFolderTest(String doneFolder) throws IOException, Interrupte
assertEquals("No of file in logDir not correct", 2,
logDirFs.listStatus(logDirPath).length);
dfsCluster = new MiniDFSCluster(conf, 2, true, null);
mr = new MiniMRCluster(2, dfsCluster.getFileSystem().getUri().toString(),
3, null, null, conf);