hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1196148 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt src/docs/src/documentation/content/xdocs/cluster_setup.xml src/java/org/apache/hadoop/fs/FileContext.java src/java/org/apache/hadoop/fs/FsConfig.java
Date Tue, 01 Nov 2011 17:12:45 GMT
Author: eli
Date: Tue Nov  1 17:12:45 2011
New Revision: 1196148

URL: http://svn.apache.org/viewvc?rev=1196148&view=rev
Log:
HADOOP-7786. svn merge -c 1196129 from trunk

Removed:
    hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/fs/FsConfig.java
Modified:
    hadoop/common/branches/branch-0.22/common/CHANGES.txt
    hadoop/common/branches/branch-0.22/common/src/docs/src/documentation/content/xdocs/cluster_setup.xml
    hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/fs/FileContext.java

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1196148&r1=1196147&r2=1196148&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Tue Nov  1 17:12:45 2011
@@ -266,6 +266,8 @@ Release 0.22.0 - Unreleased
     HADOOP-7298. Add test utility for writing multi-threaded tests. (todd and
     Harsh J Chouraria via todd)
 
+    HADOOP-7786. Remove HDFS-specific config keys defined in FsConfig. (eli)
+
   OPTIMIZATIONS
 
     HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).

Modified: hadoop/common/branches/branch-0.22/common/src/docs/src/documentation/content/xdocs/cluster_setup.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/docs/src/documentation/content/xdocs/cluster_setup.xml?rev=1196148&r1=1196147&r2=1196148&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/src/docs/src/documentation/content/xdocs/cluster_setup.xml
(original)
+++ hadoop/common/branches/branch-0.22/common/src/docs/src/documentation/content/xdocs/cluster_setup.xml
Tue Nov  1 17:12:45 2011
@@ -627,7 +627,7 @@
 		          </tr>
                   <tr>
                     <td>conf/hdfs-site.xml</td>
-                    <td>dfs.block.size</td>
+                    <td>dfs.blocksize</td>
                     <td>134217728</td>
                     <td>HDFS blocksize of 128MB for large file-systems.</td>
                   </tr>

Modified: hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/fs/FileContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/fs/FileContext.java?rev=1196148&r1=1196147&r2=1196148&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/fs/FileContext.java
(original)
+++ hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/fs/FileContext.java
Tue Nov  1 17:12:45 2011
@@ -42,6 +42,8 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.Options.CreateOpts;
 import org.apache.hadoop.fs.Options.Rename;
 import org.apache.hadoop.fs.permission.FsPermission;
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY;
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_DEFAULT_NAME_DEFAULT;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ipc.RpcClientException;
 import org.apache.hadoop.ipc.RpcServerException;
@@ -405,7 +407,9 @@ public final class FileContext {
    */
   public static FileContext getFileContext(final Configuration aConf)
       throws UnsupportedFileSystemException {
-    return getFileContext(URI.create(FsConfig.getDefaultFsURI(aConf)), aConf);
+    return getFileContext(
+      URI.create(aConf.get(FS_DEFAULT_NAME_KEY, FS_DEFAULT_NAME_DEFAULT)), 
+      aConf);
   }
 
   /**



Mime
View raw message