Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r816741 - in /hadoop/common/branches/branch-0.20:
 CHANGES.txt
 src/core/core-default.xml src/core/org/apache/hadoop/fs/FileSystem.java
 src/test/org/apache/hadoop/fs/TestDisableCache.java
Date: Fri, 18 Sep 2009 18:46:55 -0000
To: common-commits@hadoop.apache.org
From: mahadev@apache.org
Message-Id: <20090918184656.1F56F23888E4@eris.apache.org>

Author: mahadev
Date: Fri Sep 18 18:46:55 2009
New Revision: 816741

URL: http://svn.apache.org/viewvc?rev=816741&view=rev
Log:
HADOOP-6231.  Allow caching of filesystem instances to be disabled on a per-instance basis (Tom White and Ben Slusky via mahadev)

Added:
    hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestDisableCache.java
Modified:
    hadoop/common/branches/branch-0.20/CHANGES.txt
    hadoop/common/branches/branch-0.20/src/core/core-default.xml
    hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FileSystem.java

Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=816741&r1=816740&r2=816741&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Fri Sep 18 18:46:55 2009
@@ -7,6 +7,9 @@
     MAPREDUCE-112. Add counters for reduce input, output records to the new API.
     (Jothi Padmanabhan via cdouglas)
 
+    HADOOP-6231.  Allow caching of filesystem instances to be disabled on a
+    per-instance basis (Tom White and Ben Slusky via mahadev)
+
 Release 0.20.1 - 2009-09-01
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.20/src/core/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/core/core-default.xml?rev=816741&r1=816740&r2=816741&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/core/core-default.xml (original)
+++ hadoop/common/branches/branch-0.20/src/core/core-default.xml Fri Sep 18 18:46:55 2009
@@ -169,6 +169,12 @@
 </property>
 
 <property>
+  <name>fs.har.impl.disable.cache</name>
+  <value>true</value>
+  <description>Don't cache 'har' filesystem instances.</description>
+</property>
+
+<property>
   <name>fs.checkpoint.dir</name>
   <value>${hadoop.tmp.dir}/dfs/namesecondary</value>
   <description>Determines where on the local filesystem the DFS secondary

Modified: hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FileSystem.java?rev=816741&r1=816740&r2=816741&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FileSystem.java Fri Sep 18 18:46:55 2009
@@ -187,6 +187,11 @@
         return get(defaultUri, conf);              // return default
       }
     }
+    
+    String disableCacheName = String.format("fs.%s.impl.disable.cache", scheme);
+    if (conf.getBoolean(disableCacheName, false)) {
+      return createFileSystem(uri, conf);
+    }
 
     return CACHE.get(uri, conf);
   }

Added: hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestDisableCache.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestDisableCache.java?rev=816741&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestDisableCache.java (added)
+++ hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestDisableCache.java Fri Sep 18 18:46:55 2009
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.fs;
+
+import java.net.URI;
+
+import junit.framework.TestCase;
+
+import org.apache.hadoop.conf.Configuration;
+
+public class TestDisableCache extends TestCase {
+
+  public void testCacheEnabled() throws Exception {
+    Configuration conf = new Configuration();
+    conf.set("fs.cachedfile.impl", conf.get("fs.file.impl"));
+    FileSystem fs1 = FileSystem.get(new URI("cachedfile://a"), conf);
+    FileSystem fs2 = FileSystem.get(new URI("cachedfile://a"), conf);
+    assertSame(fs1, fs2);
+  }
+  
+  public void testCacheDisabled() throws Exception {
+    Configuration conf = new Configuration();
+    conf.set("fs.uncachedfile.impl", conf.get("fs.file.impl"));
+    conf.setBoolean("fs.uncachedfile.impl.disable.cache", true);
+    FileSystem fs1 = FileSystem.get(new URI("uncachedfile://a"), conf);
+    FileSystem fs2 = FileSystem.get(new URI("uncachedfile://a"), conf);
+    assertNotSame(fs1, fs2);
+  }
+
+}