Author: ivanmi
Date: Fri Jun 21 04:44:23 2013
New Revision: 1495292
URL: http://svn.apache.org/r1495292
Log:
MAPREDUCE-2351. mapred.job.tracker.history.completed.location should support an
arbitrary filesystem URI. (Backported by Chelsey Chang).
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobHistory.java
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobHistory.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1495292&r1=1495291&r2=1495292&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Jun 21 04:44:23 2013
@@ -14,6 +14,10 @@ Release 1.3.0 - unreleased
HADOOP-9573. Fix test-patch script to work with the enhanced
PreCommit-Admin script.(Giridharan Kesavan)
+ MAPREDUCE-2351. mapred.job.tracker.history.completed.location should
+ support an arbitrary filesystem URI. (Tom White, backported by
+ Chelsey Chang via ivanmi)
+
BUG FIXES
MAPREDUCE-5047. keep.failed.task.files=true causes job failure on
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobHistory.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobHistory.java?rev=1495292&r1=1495291&r2=1495292&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobHistory.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobHistory.java
Fri Jun 21 04:44:23 2013
@@ -547,8 +547,9 @@ public class JobHistory {
String doneLocation = conf.
get("mapred.job.tracker.history.completed.location");
if (doneLocation != null) {
- DONE = fs.makeQualified(new Path(doneLocation));
- DONEDIR_FS = fs;
+ Path donePath = new Path(doneLocation);
+ DONEDIR_FS = donePath.getFileSystem(conf);
+ DONE = DONEDIR_FS.makeQualified(donePath);
} else {
if (!setup) {
initLogDir(conf);
Modified:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobHistory.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobHistory.java?rev=1495292&r1=1495291&r2=1495292&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobHistory.java
(original)
+++
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobHistory.java
Fri Jun 21 04:44:23 2013
@@ -35,6 +35,7 @@ import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.fs.permission.FsPermission;
@@ -47,6 +48,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AccessControlList;
+import org.apache.hadoop.util.Shell;
/**
* Tests the JobHistory files - to catch any changes to JobHistory that can
@@ -855,8 +857,19 @@ public class TestJobHistory extends Test
conf.get(JobConf.WORKFLOW_TAGS, "")));
}
- public void testDoneFolderOnHDFS() throws IOException {
+ public void testDoneFolderOnHDFS() throws IOException, InterruptedException {
+ runDoneFolderTest("history_done");
+ }
+
+ public void testDoneFolderNotOnDefaultFileSystem() throws IOException,
+ InterruptedException {
+ runDoneFolderTest("file:///" + System.getProperty("test.build.data", "tmp")
+ + "/history_done");
+ }
+
+ private void runDoneFolderTest(String doneFolder) throws IOException,
InterruptedException {
MiniMRCluster mr = null;
+ MiniDFSCluster dfsCluster = null;
try {
JobConf conf = new JobConf();
// keep for less time
@@ -864,10 +877,9 @@ public class TestJobHistory extends Test
conf.setLong("mapred.jobtracker.retirejob.interval", 100000);
//set the done folder location
- String doneFolder = "history_done";
conf.set("mapred.job.tracker.history.completed.location", doneFolder);
- MiniDFSCluster dfsCluster = new MiniDFSCluster(conf, 2, true, null);
+ dfsCluster = new MiniDFSCluster(conf, 2, true, null);
mr = new MiniMRCluster(2, dfsCluster.getFileSystem().getUri().toString(),
3, null, null, conf);
@@ -893,7 +905,7 @@ public class TestJobHistory extends Test
Path doneDir = JobHistory.getCompletedJobHistoryLocation();
assertEquals("History DONE folder not correct",
- doneFolder, doneDir.getName());
+ new Path(doneFolder).getName(), doneDir.getName());
JobID id = job.getID();
String logFileName = getDoneFile(conf, id, doneDir);
assertNotNull(logFileName);
@@ -924,28 +936,33 @@ public class TestJobHistory extends Test
// Test that all of the ancestors of the log file have the same
// permissions as the done directory
- Path cursor = logFile.getParent();
-
- Path doneParent = doneDir.getParent();
-
- FsPermission donePermission = getStatus(fileSys,
doneDir).getPermission();
-
- System.err.println("testDoneFolderOnHDFS: done dir permission = "
- + donePermission);
+ // The folders between the done folder and the folder containing the
+ // log file are created automatically. Since the default permission
+ // on Windows may not be the same as JobHistory.HISTORY_DIR_PERMISSION
+ // so we skip this check if the file system is local file system
+ // and is windows
+ if (!(fileSys instanceof LocalFileSystem && Shell.WINDOWS)) {
+ Path cursor = logFile.getParent();
+
+ Path doneParent = doneDir.getParent();
+
+ FsPermission donePermission = getStatus(fileSys, doneDir)
+ .getPermission();
+
+ System.err.println("testDoneFolderOnHDFS: done dir permission = "
+ + donePermission);
+
+ while (!cursor.equals(doneParent)) {
+ FileStatus cursorStatus = getStatus(fileSys, cursor);
+ FsPermission cursorPermission = cursorStatus.getPermission();
+
+ assertEquals("testDoneFolder: A done directory descendant, " + cursor
+ + " does not have the same permisison as the done directory, "
+ + doneDir, donePermission, cursorPermission);
- while (!cursor.equals(doneParent)) {
- FileStatus cursorStatus = getStatus(fileSys, cursor);
- FsPermission cursorPermission = cursorStatus.getPermission();
-
- assertEquals("testDoneFolderOnHDFS: A done directory descendant, "
- + cursor
- + " does not have the same permisison as the done
directory, "
- + doneDir,
- donePermission,
- cursorPermission);
-
- cursor = cursor.getParent();
- }
+ cursor = cursor.getParent();
+ }
+ }
// check if the job file is removed from the history location
Path runningJobsHistoryFolder = logFile.getParent().getParent();
@@ -967,6 +984,10 @@ public class TestJobHistory extends Test
cleanupLocalFiles(mr);
mr.shutdown();
}
+
+ if (dfsCluster != null) {
+ dfsCluster.shutdown();
+ }
}
}
