Переглянути джерело

HADOOP-1748. Fix tasktracker to be able to launch tasks when log directory is relative. Contributed by Owen.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@570880 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 роки тому
батько
коміт
f570a3e4ba

+ 3 - 1
CHANGES.txt

@@ -31,7 +31,7 @@ Trunk (unreleased changes)
     HADOOP-1708.  Make files appear in namespace as soon as they are
     created.  (Dhruba Borthakur via dhruba)
 
-    HADOOP-1767.  Add "hadoop job -list" command. (taton via cutting)
+    HADOOP-1767.  Add "bin/hadoop job -list" sub-command. (taton via cutting)
 
   OPTIMIZATIONS
 
@@ -66,6 +66,8 @@ Trunk (unreleased changes)
     HADOOP-1749.  Change TestDFSUpgrade to sort files, fixing sporadic
     test failures.  (Enis Soztutar via cutting)
 
+    HADOOP-1748.  Fix tasktracker to be able to launch tasks when log
+    directory is relative.  (omalley via cutting)
 
   IMPROVEMENTS
 

+ 2 - 1
src/java/org/apache/hadoop/mapred/TaskLog.java

@@ -35,7 +35,8 @@ public class TaskLog {
     LogFactory.getLog(TaskLog.class.getName());
 
   private static final File LOG_DIR = 
-    new File(System.getProperty("hadoop.log.dir"), "userlogs");
+    new File(System.getProperty("hadoop.log.dir"), 
+             "userlogs").getAbsoluteFile();
   
   static {
     if (!LOG_DIR.exists()) {

+ 3 - 1
src/java/org/apache/hadoop/mapred/TaskRunner.java

@@ -270,7 +270,9 @@ abstract class TaskRunner extends Thread {
 
         // Setup the log4j prop
         long logSize = TaskLog.getTaskLogLength(conf);
-        vargs.add("-Dhadoop.log.dir=" + System.getProperty("hadoop.log.dir"));
+        vargs.add("-Dhadoop.log.dir=" + 
+                  new File(System.getProperty("hadoop.log.dir")
+                           ).getAbsolutePath());
         vargs.add("-Dhadoop.root.logger=INFO,TLA");
         vargs.add("-Dhadoop.tasklog.taskid=" + taskid);
         vargs.add("-Dhadoop.tasklog.totalLogFileSize=" + logSize);