svn commit: r713825 - in /hadoop/core/trunk: CHANGES.txt src/core/org/apache/hadoop/filecache/DistributedCache.java

[cd...@apache.org]

Author: cdouglas
Date: Thu Nov 13 13:12:15 2008
New Revision: 713825

URL: http://svn.apache.org/viewvc?rev=713825&view=rev
Log:
HADOOP-4650. Correct a mismatch between the default value of
local.cache.size in the config and the source. Contributed by Jeff Hammerbacher.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/core/org/apache/hadoop/filecache/DistributedCache.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=713825&r1=713824&r2=713825&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Nov 13 13:12:15 2008
@@ -142,6 +142,10 @@
     HADOOP-4589. Correct PiEstimator output messages and improve the code
     readability. (szetszwo)
 
+    HADOOP-4650. Correct a mismatch between the default value of
+    local.cache.size in the config and the source. (Jeff Hammerbacher via
+    cdouglas)
+
 Release 0.19.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/filecache/DistributedCache.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/filecache/DistributedCache.java?rev=713825&r1=713824&r2=713825&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/filecache/DistributedCache.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/filecache/DistributedCache.java Thu Nov 13 13:12:15 2008
@@ -117,7 +117,7 @@
   private static TreeMap<String, CacheStatus> cachedArchives = new TreeMap<String, CacheStatus>();
   
   // default total cache size
-  private static final long DEFAULT_CACHE_SIZE = 1048576L;
+  private static final long DEFAULT_CACHE_SIZE = 10737418240L;
 
   private static final Log LOG =
     LogFactory.getLog(DistributedCache.class);
@@ -208,7 +208,7 @@
 
     // try deleting stuff if you can
     long size = FileUtil.getDU(new File(baseDir.toString()));
-    // setting the cache size to a default of 1MB
+    // setting the cache size to a default of 10GB
     long allowedSize = conf.getLong("local.cache.size", DEFAULT_CACHE_SIZE);
     if (allowedSize < size) {
       // try some cache deletions