svn commit: r570880 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskLog.java src/java/org/apache/hadoop/mapred/TaskRunner.java

[cu...@apache.org]

Author: cutting
Date: Wed Aug 29 10:58:15 2007
New Revision: 570880

URL: http://svn.apache.org/viewvc?rev=570880&view=rev
Log:
HADOOP-1748.  Fix tasktracker to be able to launch tasks when log directory is relative.  Contributed by Owen.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=570880&r1=570879&r2=570880&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Aug 29 10:58:15 2007
@@ -31,7 +31,7 @@
     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 @@
     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
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java?rev=570880&r1=570879&r2=570880&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskLog.java Wed Aug 29 10:58:15 2007
@@ -35,7 +35,8 @@
     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()) {

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java?rev=570880&r1=570879&r2=570880&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java Wed Aug 29 10:58:15 2007
@@ -270,7 +270,9 @@
 
         // 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);