You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by at...@apache.org on 2012/01/03 19:07:56 UTC
svn commit: r1226900 - in
/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common: ./
src/main/conf/ src/main/docs/ src/main/java/
src/main/packages/templates/conf/ src/main/resources/ src/test/core/
Author: atm
Date: Tue Jan 3 18:07:55 2012
New Revision: 1226900
URL: http://svn.apache.org/viewvc?rev=1226900&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1226900&r1=1226899&r2=1226900&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 3 18:07:55 2012
@@ -83,6 +83,8 @@ Trunk (unreleased changes)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
+ HADOOP-7919. Remove the unused hadoop.logfile.* properties from the core-default.xml file. (harsh)
+
BUGS
HADOOP-7851. Configuration.getClasses() never returns the default value.
@@ -198,6 +200,8 @@ Release 0.23.1 - Unreleased
HADOOP-7890. Redirect hadoop script's deprecation message to stderr.
(Koji Knoguchi via mahadev)
+ HADOOP-7504. Add the missing Ganglia31 opts to hadoop-metrics.properties as a comment. (harsh)
+
OPTIMIZATIONS
BUG FIXES
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 3 18:07:55 2012
@@ -1,5 +1,5 @@
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1225899
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1226898
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties?rev=1226900&r1=1226899&r2=1226900&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties Tue Jan 3 18:07:55 2012
@@ -40,6 +40,7 @@ mapred.class=org.apache.hadoop.metrics.s
# Configuration of the "jvm" context for ganglia
# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext
+# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext31
# jvm.period=10
# jvm.servers=localhost:8649
@@ -53,6 +54,7 @@ rpc.class=org.apache.hadoop.metrics.spi.
# Configuration of the "rpc" context for ganglia
# rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext
+# rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext31
# rpc.period=10
# rpc.servers=localhost:8649
@@ -67,6 +69,7 @@ ugi.class=org.apache.hadoop.metrics.spi.
# Configuration of the "ugi" context for ganglia
# ugi.class=org.apache.hadoop.metrics.ganglia.GangliaContext
+# ugi.class=org.apache.hadoop.metrics.ganglia.GangliaContext31
# ugi.period=10
# ugi.servers=localhost:8649
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 3 18:07:55 2012
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1225899
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1226898
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 3 18:07:55 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1225899
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1226898
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml?rev=1226900&r1=1226899&r2=1226900&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml Tue Jan 3 18:07:55 2012
@@ -27,7 +27,7 @@
<!-- file system properties -->
<property>
- <name>dfs.name.dir</name>
+ <name>dfs.namenode.name.dir</name>
<value>${HADOOP_NN_DIR}</value>
<description>Determines where on the local filesystem the DFS name node
should store the name table. If this is a comma-delimited list
@@ -37,7 +37,7 @@
</property>
<property>
- <name>dfs.data.dir</name>
+ <name>dfs.datanode.data.dir</name>
<value>${HADOOP_DN_DIR}</value>
<description>Determines where on the local filesystem an DFS data node
should store its blocks. If this is a comma-delimited
@@ -49,11 +49,11 @@
</property>
<property>
- <name>dfs.safemode.threshold.pct</name>
+ <name>dfs.namenode.safemode.threshold-pct</name>
<value>1.0f</value>
<description>
- 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.
</description>
@@ -70,7 +70,7 @@
</property>
<property>
- <name>dfs.http.address</name>
+ <name>dfs.namenode.http-address</name>
<value>${HADOOP_NN_HOST}:50070</value>
<description>The name of the default file system. Either the
literal string "local" or a host:port for NDFS.
@@ -195,7 +195,7 @@
</property>
<property>
- <name>dfs.https.address</name>
+ <name>dfs.namenode.https-address</name>
<value>${HADOOP_NN_HOST}:50470</value>
<description>The https address where namenode binds</description>
</property>
@@ -203,9 +203,9 @@
<property>
<name>dfs.datanode.data.dir.perm</name>
<value>${DFS_DATANODE_DIR_PERM}</value>
- <description>The permissions that should be there on dfs.data.dir
+ <description>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.
</description>
</property>
@@ -237,7 +237,7 @@
</property>
<property>
- <name>dfs.secondary.http.address</name>
+ <name>dfs.namenode.secondary.http-address</name>
<value>${HADOOP_SNN_HOST}:50090</value>
<description>
The secondary namenode http server address and port.
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1226900&r1=1226899&r2=1226900&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml Tue Jan 3 18:07:55 2012
@@ -134,20 +134,6 @@
</description>
</property>
-<!--- logging properties -->
-
-<property>
- <name>hadoop.logfile.size</name>
- <value>10000000</value>
- <description>The max size of each log file</description>
-</property>
-
-<property>
- <name>hadoop.logfile.count</name>
- <value>10</value>
- <description>The max number of log files</description>
-</property>
-
<!-- i/o properties -->
<property>
<name>io.file.buffer.size</name>
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 3 18:07:55 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1225899
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1226898
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278