You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2011/03/16 20:13:00 UTC
svn commit: r1082264 - in /hadoop/hdfs/branches/branch-0.22: CHANGES.txt
src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
src/java/hdfs-default.xml
src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Author: szetszwo
Date: Wed Mar 16 19:13:00 2011
New Revision: 1082264
URL: http://svn.apache.org/viewvc?rev=1082264&view=rev
Log:
HDFS-1596. Replace fs.checkpoint.* with dfs.namenode.checkpoint.* in documentations. Contributed by Harsh J Chouraria
Modified:
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1082264&r1=1082263&r2=1082264&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Wed Mar 16 19:13:00 2011
@@ -503,6 +503,9 @@ Release 0.21.1 - Unreleased
HDFS-1728. SecondaryNameNode.checkpointSize is in bytes but not in MB.
(szetszwo)
+ HDFS-1596. Replace fs.checkpoint.* with dfs.namenode.checkpoint.*
+ in documentations. (Harsh J Chouraria via szetszwo)
+
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
Modified: hadoop/hdfs/branches/branch-0.22/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml?rev=1082264&r1=1082263&r2=1082264&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml Wed Mar 16 19:13:00 2011
@@ -265,11 +265,11 @@
</p>
<ul>
<li>
- <code>fs.checkpoint.period</code>, set to 1 hour by default, specifies
+ <code>dfs.namenode.checkpoint.period</code>, set to 1 hour by default, specifies
the maximum delay between two consecutive checkpoints, and
</li>
<li>
- <code>fs.checkpoint.size</code>, set to 64MB by default, defines the
+ <code>dfs.namenode.checkpoint.size</code>, set to 64MB by default, defines the
size of the edits log file that forces an urgent checkpoint even if
the maximum checkpoint delay is not reached.
</li>
@@ -316,11 +316,11 @@
</p>
<ul>
<li>
- <code>fs.checkpoint.period</code>, set to 1 hour by default, specifies
+ <code>dfs.namenode.checkpoint.period</code>, set to 1 hour by default, specifies
the maximum delay between two consecutive checkpoints
</li>
<li>
- <code>fs.checkpoint.size</code>, set to 64MB by default, defines the
+ <code>dfs.namenode.checkpoint.size</code>, set to 64MB by default, defines the
size of the edits log file that forces an urgent checkpoint even if
the maximum checkpoint delay is not reached.
</li>
@@ -407,7 +407,7 @@
</li>
<li>
Specify the location of the checkpoint directory in the
- configuration variable <code>fs.checkpoint.dir</code>;
+ configuration variable <code>dfs.namenode.checkpoint.dir</code>;
</li>
<li>
and start the NameNode with <code>-importCheckpoint</code> option.
@@ -415,11 +415,11 @@
</ul>
<p>
The NameNode will upload the checkpoint from the
- <code>fs.checkpoint.dir</code> directory and then save it to the NameNode
+ <code>dfs.namenode.checkpoint.dir</code> directory and then save it to the NameNode
directory(s) set in <code>dfs.name.dir</code>.
The NameNode will fail if a legal image is contained in
<code>dfs.name.dir</code>.
- The NameNode verifies that the image in <code>fs.checkpoint.dir</code> is
+ The NameNode verifies that the image in <code>dfs.namenode.checkpoint.dir</code> is
consistent, but does not modify it in any way.
</p>
<p>
Modified: hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml?rev=1082264&r1=1082263&r2=1082264&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/src/java/hdfs-default.xml Wed Mar 16 19:13:00 2011
@@ -511,7 +511,7 @@ creations/deletions), or "all".</descrip
name node should store the temporary edits to merge.
If this is a comma-delimited list of directoires then teh edits is
replicated in all of the directoires for redundancy.
- Default value is same as fs.checkpoint.dir
+ Default value is same as dfs.namenode.checkpoint.dir
</description>
</property>
@@ -526,7 +526,7 @@ creations/deletions), or "all".</descrip
<name>dfs.namenode.checkpoint.size</name>
<value>67108864</value>
<description>The size of the current edit log (in bytes) that triggers
- a periodic checkpoint even if the fs.checkpoint.period hasn't expired.
+ a periodic checkpoint even if the dfs.namenode.checkpoint.period hasn't expired.
</description>
</property>
Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1082264&r1=1082263&r2=1082264&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java (original)
+++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Wed Mar 16 19:13:00 2011
@@ -1721,7 +1721,7 @@ public class FSImage extends Storage {
* @param conf the Configuration
* @param defaultValue a default value for the attribute, if null
* @return a Collection of URIs representing the values in
- * fs.checkpoint.dir configuration property
+ * dfs.namenode.checkpoint.dir configuration property
*/
static Collection<URI> getCheckpointDirs(Configuration conf,
String defaultValue) {