From c0f4668bd4ae8e76e8f458c551a233c050f5ccf0 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Sun, 1 Jan 2012 03:16:21 +0000 Subject: [PATCH] merge HDFS-2574 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226212 13f79535-47bb-0310-9956-ffa450edef68 --- .../packages/templates/conf/hdfs-site.xml | 20 +++++++++---------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../packages/templates/conf/hdfs-site.xml | 4 ++-- .../src/main/resources/hdfs-default.xml | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml index d61d4916823..eaadfdbc6f7 100644 --- a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml +++ b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml @@ -19,7 +19,7 @@ - dfs.name.dir + dfs.namenode.name.dir ${HADOOP_NN_DIR} Determines where on the local filesystem the DFS name node should store the name table. If this is a comma-delimited list @@ -29,7 +29,7 @@ - dfs.data.dir + dfs.datanode.data.dir ${HADOOP_DN_DIR} Determines where on the local filesystem an DFS data node should store its blocks. If this is a comma-delimited @@ -41,11 +41,11 @@ - dfs.safemode.threshold.pct + dfs.namenode.safemode.threshold-pct 1.0f - Specifies the percentage of blocks that should satisfy - the minimal replication requirement defined by dfs.replication.min. + Specifies the percentage of blocks that should satisfy the minimal + replication requirement defined by dfs.namenode.replication.min. Values less than or equal to 0 mean not to start in safe mode. Values greater than 1 will make safe mode permanent. @@ -62,7 +62,7 @@ - dfs.http.address + dfs.namenode.http-address ${HADOOP_NN_HOST}:50070 The name of the default file system. Either the literal string "local" or a host:port for NDFS. @@ -167,7 +167,7 @@ - dfs.https.address + dfs.namenode.https-address ${HADOOP_NN_HOST}:50470 The https address where namenode binds @@ -175,9 +175,9 @@ dfs.datanode.data.dir.perm ${DFS_DATANODE_DIR_PERM} - The permissions that should be there on dfs.data.dir + The permissions that should be there on dfs.datanode.data.dir directories. The datanode will not come up if the permissions are - different on existing dfs.data.dir directories. If the directories + different on existing dfs.datanode.data.dir directories. If the directories don't exist, they will be created with this permission. @@ -209,7 +209,7 @@ - dfs.secondary.http.address + dfs.namenode.secondary.http-address ${HADOOP_SNN_HOST}:50090 The secondary namenode http server address and port. diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e56ebf1762d..4f1ef24df86 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -61,6 +61,8 @@ Release 0.23.1 - UNRELEASED HDFS-2335. DataNodeCluster and NNStorage always pull fresh entropy. (Uma Maheswara Rao G via eli) + HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh) + OPTIMIZATIONS HDFS-2130. Switch default checksum to CRC32C. (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml index 178159e0ca1..6fe4457c8e2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml @@ -22,11 +22,11 @@ ${HADOOP_REPLICATION} - dfs.name.dir + dfs.namenode.name.dir ${HADOOP_NN_DIR} - dfs.data.dir + dfs.datanode.data.dir ${HADOOP_DN_DIR} diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 11ca83a1fe3..394a2319c1e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -199,8 +199,8 @@ creations/deletions), or "all". dfs.namenode.name.dir.restore false Set to true to enable NameNode to attempt recovering a - previously failed dfs.name.dir. When enabled, a recovery of any failed - directory is attempted during checkpoint. + previously failed dfs.namenode.name.dir. When enabled, a recovery of any + failed directory is attempted during checkpoint. @@ -223,7 +223,7 @@ creations/deletions), or "all". Determines where on the local filesystem the DFS name node should store the transaction (edits) file. If this is a comma-delimited list of directories then the transaction file is replicated in all of the - directories, for redundancy. Default value is same as dfs.name.dir + directories, for redundancy. Default value is same as dfs.namenode.name.dir