Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport of HADOOP-6802. svn merge -c 1355784 from trunk. (harsh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355788 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-06-30 18:44:31 +00:00
parent f62de1d81e
commit 1ddedb6345
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -50,6 +50,10 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8449. hadoop fs -text fails with compressed sequence files
with the codec file extension (harsh)
HADOOP-6802. Remove FS_CLIENT_BUFFER_DIR_KEY = "fs.client.buffer.dir"
from CommonConfigurationKeys.java (not used, deprecated)
(Sho Shimauchi via harsh)
BUG FIXES
HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -114,8 +114,8 @@ import org.xml.sax.SAXException;
* For example, one might define a final parameter with:
* <tt><pre>
* &lt;property&gt;
* &lt;name&gt;dfs.client.buffer.dir&lt;/name&gt;
* &lt;value&gt;/tmp/hadoop/dfs/client&lt;/value&gt;
* &lt;name&gt;dfs.hosts.include&lt;/name&gt;
* &lt;value&gt;/etc/hadoop/conf/hosts.include&lt;/value&gt;
* <b>&lt;final&gt;true&lt;/final&gt;</b>
* &lt;/property&gt;</pre></tt>
*
@ -2116,8 +2116,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
new String[]{CommonConfigurationKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY});
Configuration.addDeprecation("dfs.df.interval",
new String[]{CommonConfigurationKeys.FS_DF_INTERVAL_KEY});
Configuration.addDeprecation("dfs.client.buffer.dir",
new String[]{CommonConfigurationKeys.FS_CLIENT_BUFFER_DIR_KEY});
Configuration.addDeprecation("hadoop.native.lib",
new String[]{CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY});
Configuration.addDeprecation("fs.default.name",

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
View File

@ -44,11 +44,6 @@ public class CommonConfigurationKeys extends CommonConfigurationKeysPublic {
"fs.permissions.umask-mode";
/** Default value for FS_PERMISSIONS_UMASK_KEY */
public static final int FS_PERMISSIONS_UMASK_DEFAULT = 0022;
/** @deprecated not used, jira was created to remove this constant:
* https://issues.apache.org/jira/browse/HADOOP-6802
*/
public static final String FS_CLIENT_BUFFER_DIR_KEY =
"fs.client.buffer.dir";
/** How often does RPC client send pings to RPC server */
public static final String IPC_PING_INTERVAL_KEY = "ipc.ping.interval";
/** Default value for IPC_PING_INTERVAL_KEY */

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
View File

@ -66,8 +66,8 @@ import org.apache.hadoop.conf.Configuration;
@InterfaceStability.Unstable
public class LocalDirAllocator {
//A Map from the config item names like "mapred.local.dir",
//"dfs.client.buffer.dir" to the instance of the AllocatorPerContext. This
//A Map from the config item names like "mapred.local.dir"
//to the instance of the AllocatorPerContext. This
//is a static object to make sure there exists exactly one instance per JVM
private static Map <String, AllocatorPerContext> contexts =
new TreeMap<String, AllocatorPerContext>();

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
View File

@ -48,7 +48,7 @@ public class TestLocalDirAllocator {
final static private String QUALIFIED_DIR_ROOT;
final static private Path BUFFER_PATH_ROOT = new Path(BUFFER_DIR_ROOT);
final static private File BUFFER_ROOT = new File(BUFFER_DIR_ROOT);
final static private String CONTEXT = "fs.client.buffer.dir";
final static private String CONTEXT = "mapred.local.dir";
final static private String FILENAME = "block";
final static private LocalDirAllocator dirAllocator =
new LocalDirAllocator(CONTEXT);