HADOOP-7117. Remove fs.checkpoint.* from core-default.xml and replace fs.checkpoint.* with dfs.namenode.checkpoint.* in documentations. Contributed by Harsh J Chouraria

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@1082331 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -41,6 +41,10 @@ Release 0.21.1 - Unreleased
     HADOOP-7162. Rmove a duplicated call FileSystem.listStatus(..) in FsShell.
     (Alexey Diomin via szetszwo)
 
+    HADOOP-7117. Remove fs.checkpoint.* from core-default.xml and replace
+    fs.checkpoint.* with dfs.namenode.checkpoint.* in documentations.
+    (Harsh J Chouraria via szetszwo)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

src/docs/cn/src/documentation/content/xdocs/commands_manual.xml

@@ -548,7 +548,7 @@
 			           </tr>
 			           <tr>
 			          	<td><code>-importCheckpoint</code></td>
-			            <td>从检查点目录装载镜像并保存到当前检查点目录，检查点目录由fs.checkpoint.dir指定。
+			            <td>从检查点目录装载镜像并保存到当前检查点目录，检查点目录由dfs.namenode.checkpoint.dir指定。
 			            </td>
 			           </tr>
 			     </table>
@@ -567,7 +567,7 @@
 			
 			           <tr>
 			          	<td><code>-checkpoint [force]</code></td>
-			            <td>如果EditLog的大小 >= fs.checkpoint.size，启动Secondary namenode的检查点过程。
+			            <td>如果EditLog的大小 >= dfs.namenode.checkpoint.size，启动Secondary namenode的检查点过程。
 			            如果使用了-force，将不考虑EditLog的大小。</td>
 			           </tr>
 			           <tr>

src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml

@@ -276,11 +276,11 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的
 </p>
    <ul>
       <li>
-        <code>fs.checkpoint.period</code>，指定连续两次检查点的最大时间间隔，
+        <code>dfs.namenode.checkpoint.period</code>，指定连续两次检查点的最大时间间隔，
         默认值是1小时。
       </li>
       <li>
-        <code>fs.checkpoint.size</code>定义了edits日志文件的最大值，一旦超过这个值会导致强制执行检查点（即使没到检查点的最大时间间隔）。默认值是64MB。
+        <code>dfs.namenode.checkpoint.size</code>定义了edits日志文件的最大值，一旦超过这个值会导致强制执行检查点（即使没到检查点的最大时间间隔）。默认值是64MB。
       </li>
    </ul>
    <p>
@@ -296,17 +296,17 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的
         在配置参数<code>dfs.name.dir</code>指定的位置建立一个空文件夹；
       </li>
       <li>
-        把检查点目录的位置赋值给配置参数<code>fs.checkpoint.dir</code>；
+        把检查点目录的位置赋值给配置参数<code>dfs.namenode.checkpoint.dir</code>；
       </li>
       <li>
         启动NameNode，并加上<code>-importCheckpoint</code>。 
       </li>
    </ul>
    <p>
-     NameNode会从<code>fs.checkpoint.dir</code>目录读取检查点，
+     NameNode会从<code>dfs.namenode.checkpoint.dir</code>目录读取检查点，
      并把它保存在<code>dfs.name.dir</code>目录下。
      如果<code>dfs.name.dir</code>目录下有合法的镜像文件，NameNode会启动失败。
-     NameNode会检查<code>fs.checkpoint.dir</code>目录下镜像文件的一致性，但是不会去改动它。
+     NameNode会检查<code>dfs.namenode.checkpoint.dir</code>目录下镜像文件的一致性，但是不会去改动它。
    </p>
    <p>
      命令的使用方法请参考<a href="commands_manual.html#secondarynamenode"><code>secondarynamenode</code> 命令</a>.
@@ -320,11 +320,11 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的
 +   </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>
@@ -347,7 +347,7 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的
 +      </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.
@@ -355,11 +355,11 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的
 +   </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>

src/docs/src/documentation/content/xdocs/commands_manual.xml

@@ -706,7 +706,7 @@
 			           <tr>
 			          	<td><code>-importCheckpoint</code></td>
 			            <td>Loads image from a checkpoint directory and saves it into the current one. Checkpoint directory 
-			            is read from property fs.checkpoint.dir
+			            is read from property dfs.namenode.checkpoint.dir
 			            (see <a href="http://hadoop.apache.org/hdfs/docs/current/hdfs_user_guide.html#Import+checkpoint">Import Checkpoint</a>).
 			            </td>
 			           </tr>
@@ -743,7 +743,7 @@
 			
 			           <tr>
 			          	<td><code>-checkpoint [force]</code></td>
-			            <td>Checkpoints the Secondary namenode if EditLog size >= fs.checkpoint.size. 
+			            <td>Checkpoints the Secondary namenode if EditLog size >= dfs.namenode.checkpoint.size. 
 			            If -force is used, checkpoint irrespective of EditLog size.</td>
 			           </tr>
 			           <tr>

src/java/core-default.xml

@@ -234,42 +234,6 @@
   <description>Don't cache 'har' filesystem instances.</description>
 </property>
 
-<property>
-  <name>fs.checkpoint.dir</name>
-  <value>${hadoop.tmp.dir}/dfs/namesecondary</value>
-  <description>Determines where on the local filesystem the DFS secondary
-      name node should store the temporary images to merge.
-      If this is a comma-delimited list of directories then the image is
-      replicated in all of the directories for redundancy.
-  </description>
-</property>
-
-<property>
-  <name>fs.checkpoint.edits.dir</name>
-  <value>${fs.checkpoint.dir}</value>
-  <description>Determines where on the local filesystem the DFS secondary
-      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
-  </description>
-</property>
-
-<property>
-  <name>fs.checkpoint.period</name>
-  <value>3600</value>
-  <description>The number of seconds between two periodic checkpoints.
-  </description>
-</property>
-
-<property>
-  <name>fs.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.
-  </description>
-</property>
-
 <property>
   <name>fs.df.interval</name>
   <value>60000</value>