HDFS-1596. Replace fs.checkpoint.* with dfs.namenode.checkpoint.* in documentations. Contributed by Harsh J Chouraria
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/branch-0.21@1082266 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 13cfae2..6dfb596 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -49,6 +49,9 @@
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
diff --git a/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml b/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
index 698f01b..d5cd782 100644
--- a/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
+++ b/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
@@ -261,11 +261,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>
@@ -312,11 +312,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>
@@ -403,7 +403,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.
@@ -411,11 +411,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>
diff --git a/src/java/hdfs-default.xml b/src/java/hdfs-default.xml
index 2e72c6a..2837815 100644
--- a/src/java/hdfs-default.xml
+++ b/src/java/hdfs-default.xml
@@ -469,7 +469,7 @@
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>
@@ -484,7 +484,7 @@
<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>
diff --git a/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
index 4aa39bc..0eb767f 100644
--- a/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
+++ b/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
@@ -2063,7 +2063,7 @@
* @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) {
