hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r631912 - in /hadoop/core/trunk: CHANGES.txt conf/hadoop-default.xml src/java/org/apache/hadoop/mapred/JobHistory.java
Date Thu, 28 Feb 2008 10:11:38 GMT
Author: ddas
Date: Thu Feb 28 02:11:35 2008
New Revision: 631912

URL: http://svn.apache.org/viewvc?rev=631912&view=rev
Log:
HADOOP-2727. Fixes a problem to do with file: URI in the JobHistory init. Contributed by Amareshwari
Sri Ramadasu.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/conf/hadoop-default.xml
    hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobHistory.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=631912&r1=631911&r2=631912&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Feb 28 02:11:35 2008
@@ -74,6 +74,9 @@
     HADOOP-2727. Fix links in Web UI of the hadoop daemons and some docs
     (Amareshwari Sri Ramadasu via ddas)
 
+    HADOOP-2727. Fixes a problem to do with file: URI in the JobHistory init.
+    (Amareshwari Sri Ramadasu via ddas)
+
 Release 0.16.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/conf/hadoop-default.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/conf/hadoop-default.xml?rev=631912&r1=631911&r2=631912&view=diff
==============================================================================
--- hadoop/core/trunk/conf/hadoop-default.xml (original)
+++ hadoop/core/trunk/conf/hadoop-default.xml Thu Feb 28 02:11:35 2008
@@ -37,10 +37,10 @@
 
 <property>
   <name>hadoop.job.history.location</name>
-  <value>file://${hadoop.log.dir}/history</value>
+  <value></value>
   <description> If job tracker is static the history files are stored 
-  in this single well known place. By default, it is in the local 
-  file system at ${hadoop.log.dir}/history.
+  in this single well known place. If No value is set here, by default,
+  it is in the local file system at ${hadoop.log.dir}/history.
   </description>
 </property>
 

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobHistory.java?rev=631912&r1=631911&r2=631912&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobHistory.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobHistory.java Thu Feb 28 02:11:35
2008
@@ -116,7 +116,9 @@
   public static void init(JobConf conf, String hostname){
     if (!disableHistory){
       try{
-        LOG_DIR = conf.get("hadoop.job.history.location");
+        LOG_DIR = conf.get("hadoop.job.history.location" ,
+          "file:///" + new File(System.getProperty(
+          "hadoop.log.dir")).getAbsolutePath() + File.separator + "history");
         JOBTRACKER_UNIQUE_STRING = hostname + "_" + 
                                    JOBTRACKER_START_TIME + "_";
         Path logDir = new Path(LOG_DIR);
@@ -126,6 +128,7 @@
             throw new IOException("Mkdirs failed to create " + logDir.toString());
           }
         }
+        conf.set("hadoop.job.history.location", LOG_DIR);
       }catch(IOException e){
         LOG.error("Failed to initialize JobHistory log file", e); 
         disableHistory = true; 



Mime
View raw message