diff --git a/CHANGES.txt b/CHANGES.txt index 80bb2902602..71f10949674 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -585,6 +585,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 diff --git a/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml b/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml index f461beac212..beb65b677d4 100644 --- a/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml +++ b/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml @@ -548,7 +548,7 @@ -importCheckpoint - 从检查点目录装载镜像并保存到当前检查点目录，检查点目录由fs.checkpoint.dir指定。 + 从检查点目录装载镜像并保存到当前检查点目录，检查点目录由dfs.namenode.checkpoint.dir指定。 @@ -567,7 +567,7 @@ -checkpoint [force] - 如果EditLog的大小 >= fs.checkpoint.size，启动Secondary namenode的检查点过程。 + 如果EditLog的大小 >= dfs.namenode.checkpoint.size，启动Secondary namenode的检查点过程。 如果使用了-force，将不考虑EditLog的大小。 diff --git a/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml b/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml index 40a43c997ac..a9ed08fb943 100644 --- a/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml +++ b/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml @@ -276,11 +276,11 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的

@@ -296,17 +296,17 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的 在配置参数dfs.name.dir指定的位置建立一个空文件夹；

  • - 把检查点目录的位置赋值给配置参数fs.checkpoint.dir； + 把检查点目录的位置赋值给配置参数dfs.namenode.checkpoint.dir；
  • 启动NameNode，并加上-importCheckpoint。

    • - NameNode会从fs.checkpoint.dir目录读取检查点， + NameNode会从dfs.namenode.checkpoint.dir目录读取检查点， 并把它保存在dfs.name.dir目录下。 如果dfs.name.dir目录下有合法的镜像文件，NameNode会启动失败。 - NameNode会检查fs.checkpoint.dir目录下镜像文件的一致性，但是不会去改动它。 + NameNode会检查dfs.namenode.checkpoint.dir目录下镜像文件的一致性，但是不会去改动它。

    命令的使用方法请参考secondarynamenode 命令. @@ -320,11 +320,11 @@ Secondary NameNode的检查点进程启动，是由两个配置参数控制的 +

    + +

    + The NameNode will upload the checkpoint from the -+ fs.checkpoint.dir directory and then save it to the NameNode ++ dfs.namenode.checkpoint.dir directory and then save it to the NameNode + directory(s) set in dfs.name.dir. + The NameNode will fail if a legal image is contained in + dfs.name.dir. -+ The NameNode verifies that the image in fs.checkpoint.dir is ++ The NameNode verifies that the image in dfs.namenode.checkpoint.dir is + consistent, but does not modify it in any way. +

    +

    diff --git a/src/docs/src/documentation/content/xdocs/commands_manual.xml b/src/docs/src/documentation/content/xdocs/commands_manual.xml index dd5291b26b0..06ee65b357d 100644 --- a/src/docs/src/documentation/content/xdocs/commands_manual.xml +++ b/src/docs/src/documentation/content/xdocs/commands_manual.xml @@ -726,7 +726,7 @@ -importCheckpoint 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 Import Checkpoint). @@ -763,7 +763,7 @@ -checkpoint [force] - Checkpoints the Secondary namenode if EditLog size >= fs.checkpoint.size. + Checkpoints the Secondary namenode if EditLog size >= dfs.namenode.checkpoint.size. If -force is used, checkpoint irrespective of EditLog size. diff --git a/src/java/core-default.xml b/src/java/core-default.xml index 643640b3911..85e5966a225 100644 --- a/src/java/core-default.xml +++ b/src/java/core-default.xml @@ -324,42 +324,6 @@ Don't cache 'har' filesystem instances. - - fs.checkpoint.dir - ${hadoop.tmp.dir}/dfs/namesecondary - 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. - - - - - fs.checkpoint.edits.dir - ${fs.checkpoint.dir} - 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 - - - - - fs.checkpoint.period - 3600 - The number of seconds between two periodic checkpoints. - - - - - fs.checkpoint.size - 67108864 - The size of the current edit log (in bytes) that triggers - a periodic checkpoint even if the fs.checkpoint.period hasn't expired. - - - fs.df.interval 60000