Author: tomwhite
Date: Fri Sep 4 23:38:00 2009
New Revision: 811572
URL: http://svn.apache.org/viewvc?rev=811572&view=rev
Log:
HADOOP-6231. Allow caching of filesystem instances to be disabled on a
per-instance basis.
Added:
hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestFileSystem.java
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/java/core-default.xml
hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=811572&r1=811571&r2=811572&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Sep 4 23:38:00 2009
@@ -517,6 +517,9 @@
HADOOP-6224. Add a method to WritableUtils performing a bounded read of an
encoded String. (Jothi Padmanabhan via cdouglas)
+ HADOOP-6231. Allow caching of filesystem instances to be disabled on a
+ per-instance basis. (tomwhite)
+
OPTIMIZATIONS
HADOOP-5595. NameNode does not need to run a replicator to choose a
Modified: hadoop/common/trunk/src/java/core-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/core-default.xml?rev=811572&r1=811571&r2=811572&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/core-default.xml (original)
+++ hadoop/common/trunk/src/java/core-default.xml Fri Sep 4 23:38:00 2009
@@ -203,6 +203,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/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java?rev=811572&r1=811571&r2=811572&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java Fri Sep
4 23:38:00 2009
@@ -181,6 +181,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/trunk/src/test/core/org/apache/hadoop/fs/TestFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestFileSystem.java?rev=811572&view=auto
==============================================================================
--- hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestFileSystem.java
(added)
+++ hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestFileSystem.java
Fri Sep 4 23:38:00 2009
@@ -0,0 +1,50 @@
+/**
+ * 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 static junit.framework.Assert.assertSame;
+import static junit.framework.Assert.assertNotSame;
+
+import java.net.URI;
+
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Test;
+
+public class TestFileSystem {
+
+ @Test
+ 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);
+ }
+
+ @Test
+ 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);
+ }
+
+}
