Author: omalley
Date: Fri Mar 4 03:31:30 2011
New Revision: 1077027
URL: http://svn.apache.org/viewvc?rev=1077027&view=rev
Log:
commit 7afec7f63ca0d79c0f94c059e5dd706f30353d41
Author: Mahadev Konar <[email protected]>
Date: Tue Oct 20 23:53:38 2009 +0000
HADOOP-6231 from
https://issues.apache.org/jira/secure/attachment/12419639/HADOOP-6231-branch-0.20.patch
+++ b/YAHOO-CHANGES.txt
+
+ HADOOP-6231. Allow caching of filesystem instances to be disabled on a
+ per-instance basis (ben slusky via mahadev)
Added:
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/fs/TestDisableCache.java
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FileSystem.java
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml?rev=1077027&r1=1077026&r2=1077027&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml
Fri Mar 4 03:31:30 2011
@@ -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-security-patches/src/core/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FileSystem.java?rev=1077027&r1=1077026&r2=1077027&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FileSystem.java
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FileSystem.java
Fri Mar 4 03:31:30 2011
@@ -187,6 +187,11 @@ public abstract class FileSystem extends
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-security-patches/src/test/org/apache/hadoop/fs/TestDisableCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/fs/TestDisableCache.java?rev=1077027&view=auto
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/fs/TestDisableCache.java
(added)
+++
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/fs/TestDisableCache.java
Fri Mar 4 03:31:30 2011
@@ -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);
+ }
+
+}
