hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yhema...@apache.org
Subject svn commit: r904491 - in /hadoop/mapreduce/trunk: CHANGES.txt src/java/mapred-default.xml src/java/org/apache/hadoop/mapred/JobTracker.java src/test/mapred-site.xml
Date Fri, 29 Jan 2010 13:35:41 GMT
Author: yhemanth
Date: Fri Jan 29 13:35:40 2010
New Revision: 904491

URL: http://svn.apache.org/viewvc?rev=904491&view=rev
Log:
MAPREDUCE-1322. Defines default value for staging directory to be user based fixing a failing
streaming test. Contributed by Devaraj Das and Amareshwari Sriramadasu.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/java/mapred-default.xml
    hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
    hadoop/mapreduce/trunk/src/test/mapred-site.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=904491&r1=904490&r2=904491&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jan 29 13:35:40 2010
@@ -268,6 +268,10 @@
     MAPREDUCE-1395. Sqoop does not check return value of Job.waitForCompletion().
     (Aaron Kimball via tomwhite)
 
+    MAPREDUCE-1322. Defines default value for staging directory to be user
+    based fixing a failing streaming test.
+    (Devaraj Das and Amareshwari Sriramadasu via yhemanth)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/java/mapred-default.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/mapred-default.xml?rev=904491&r1=904490&r2=904491&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/mapred-default.xml (original)
+++ hadoop/mapreduce/trunk/src/java/mapred-default.xml Fri Jan 29 13:35:40 2010
@@ -143,7 +143,16 @@
 <property>
   <name>mapreduce.jobtracker.system.dir</name>
   <value>${hadoop.tmp.dir}/mapred/system</value>
-  <description>The shared directory where MapReduce stores control files.
+  <description>The directory where MapReduce stores control files.
+  </description>
+</property>
+
+<property>
+  <name>mapreduce.jobtracker.staging.root.dir</name>
+  <value>${hadoop.tmp.dir}/mapred/staging</value>
+  <description>The root of the staging area for users' job files
+  In practice, this should be the directory where users' home 
+  directories are located (usually /user)
   </description>
 </property>
 

Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=904491&r1=904490&r2=904491&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java Fri Jan 29 13:35:40
2010
@@ -177,8 +177,6 @@
 
   private MRAsyncDiskService asyncDiskService;
   
-  private final String defaultStagingBaseDir;
-  
   /**
    * A client tried to submit a job before the Job Tracker was ready.
    */
@@ -1313,7 +1311,6 @@
     tasktrackerExpiryInterval = 0;
     myInstrumentation = new JobTrackerMetricsInst(this, new JobConf());
     mrOwner = null;
-    defaultStagingBaseDir = "/Users"; 
   }
 
   
@@ -1565,8 +1562,6 @@
 
     //initializes the job status store
     completedJobStatusStore = new CompletedJobStatusStore(conf);
-    Path homeDir = fs.getHomeDirectory();
-    defaultStagingBaseDir = homeDir.getParent().toString();
   }
 
   private static SimpleDateFormat getDateFormat() {
@@ -3668,7 +3663,8 @@
    */
   public String getStagingAreaDir() throws IOException {
     Path stagingRootDir = new Path(conf.get(JTConfig.JT_STAGING_AREA_ROOT, 
-        defaultStagingBaseDir));
+        "/tmp/hadoop/mapred/staging"));
+    FileSystem fs = stagingRootDir.getFileSystem(conf);
     String user = UserGroupInformation.getCurrentUser().getUserName();
     return fs.makeQualified(new Path(stagingRootDir, 
                                 user+"/.staging")).toString();
@@ -4423,8 +4419,6 @@
 
     //initializes the job status store
     completedJobStatusStore = new CompletedJobStatusStore(conf);
-    Path homeDir = fs.getHomeDirectory();
-    defaultStagingBaseDir = homeDir.getParent().toString();
   }
 
   /**

Modified: hadoop/mapreduce/trunk/src/test/mapred-site.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred-site.xml?rev=904491&r1=904490&r2=904491&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred-site.xml (original)
+++ hadoop/mapreduce/trunk/src/test/mapred-site.xml Fri Jan 29 13:35:40 2010
@@ -40,9 +40,4 @@
   <value>false</value>
   <description></description>
 </property>
-<property>
-  <name>mapreduce.jobtracker.staging.root.dir</name>
-  <value>${hadoop.tmp.dir}/staging</value>
-  <description></description>
-</property>
 </configuration>



Mime
View raw message