Browse Source

HADOOP-5219. Adds a new property io.seqfile.local.dir for use by SequenceFile, which earlier used mapred.local.dir. Contributed by Sharad Agarwal.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@746929 13f79535-47bb-0310-9956-ffa450edef68
Devaraj Das 16 years ago
parent
commit
1dd9fd71cf
3 changed files with 14 additions and 1 deletions
  1. 3 0
      CHANGES.txt
  2. 10 0
      src/core/core-default.xml
  3. 1 1
      src/core/org/apache/hadoop/io/SequenceFile.java

+ 3 - 0
CHANGES.txt

@@ -212,6 +212,9 @@ Trunk (unreleased changes)
     and that brings down the log messages in the JobClient to do with 
     and that brings down the log messages in the JobClient to do with 
     NetworkTopology.add significantly. (Jothi Padmanabhan via ddas)
     NetworkTopology.add significantly. (Jothi Padmanabhan via ddas)
 
 
+    HADOOP-5219. Adds a new property io.seqfile.local.dir for use by SequenceFile,
+    which earlier used mapred.local.dir. (Sharad Agarwal via ddas)
+
 Release 0.20.0 - Unreleased
 Release 0.20.0 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 10 - 0
src/core/core-default.xml

@@ -90,6 +90,16 @@
   obtaining serializers and deserializers.</description>
   obtaining serializers and deserializers.</description>
 </property>
 </property>
 
 
+<property>
+  <name>io.seqfile.local.dir</name>
+  <value>${hadoop.tmp.dir}/io/local</value>
+  <description>The local directory where sequence file stores intermediate
+  data files during merge.  May be a comma-separated list of
+  directories on different devices in order to spread disk i/o.
+  Directories that do not exist are ignored.
+  </description>
+</property>
+
 <!-- file system properties -->
 <!-- file system properties -->
 
 
 <property>
 <property>

+ 1 - 1
src/core/org/apache/hadoop/io/SequenceFile.java

@@ -2870,7 +2870,7 @@ public class SequenceFile {
         int numSegments = sortedSegmentSizes.size();
         int numSegments = sortedSegmentSizes.size();
         int origFactor = factor;
         int origFactor = factor;
         int passNo = 1;
         int passNo = 1;
-        LocalDirAllocator lDirAlloc = new LocalDirAllocator("mapred.local.dir");
+        LocalDirAllocator lDirAlloc = new LocalDirAllocator("io.seqfile.local.dir");
         do {
         do {
           //get the factor for this pass of merge
           //get the factor for this pass of merge
           factor = getPassFactor(passNo, numSegments);
           factor = getPassFactor(passNo, numSegments);