hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1125594 - in /hadoop/common/branches/yahoo-merge: ./ src/contrib/ec2/ src/docs/ src/docs/cn/src/documentation/content/xdocs/ src/docs/src/documentation/content/xdocs/ src/java/ src/test/core/
Date Fri, 20 May 2011 23:14:48 GMT
Author: szetszwo
Date: Fri May 20 23:14:48 2011
New Revision: 1125594

URL: http://svn.apache.org/viewvc?rev=1125594&view=rev
Log:
svn merge -c 1082329 from trunk for HADOOP-7117.

Modified:
    hadoop/common/branches/yahoo-merge/   (props changed)
    hadoop/common/branches/yahoo-merge/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/yahoo-merge/src/contrib/ec2/   (props changed)
    hadoop/common/branches/yahoo-merge/src/docs/   (props changed)
    hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml
    hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml
    hadoop/common/branches/yahoo-merge/src/docs/src/documentation/content/xdocs/commands_manual.xml
    hadoop/common/branches/yahoo-merge/src/java/   (props changed)
    hadoop/common/branches/yahoo-merge/src/java/core-default.xml
    hadoop/common/branches/yahoo-merge/src/test/core/   (props changed)

Propchange: hadoop/common/branches/yahoo-merge/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 23:14:48 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1043117,1078148,1080396,1081598,1087844,1091618,1092565,1100026
+/hadoop/common/trunk:1043117,1078148,1080396,1081598,1082329,1087844,1091618,1092565,1100026
 /hadoop/core/branches/branch-0.19/core:713112

Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1125594&r1=1125593&r2=1125594&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Fri May 20 23:14:48 2011
@@ -425,6 +425,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

Propchange: hadoop/common/branches/yahoo-merge/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 23:14:48 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1043117,1078148,1080396,1081598,1087844,1091618,1092565,1092832,1100026
+/hadoop/common/trunk/CHANGES.txt:1043117,1078148,1080396,1081598,1082329,1087844,1091618,1092565,1092832,1100026
 /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

Propchange: hadoop/common/branches/yahoo-merge/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 23:14:48 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:1043117,1078148,1081598,1087844,1091618,1092565,1100026
+/hadoop/common/trunk/src/contrib/ec2:1043117,1078148,1081598,1082329,1087844,1091618,1092565,1100026
 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
 /hadoop/core/trunk/src/contrib/ec2:776175-784663

Propchange: hadoop/common/branches/yahoo-merge/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 23:14:48 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1043117,1078148,1080396,1081598,1087844,1091618,1092565,1100026
+/hadoop/common/trunk/src/docs:1043117,1078148,1080396,1081598,1082329,1087844,1091618,1092565,1100026
 /hadoop/core/branches/branch-0.19/src/docs:713112

Modified: hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml?rev=1125594&r1=1125593&r2=1125594&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml
(original)
+++ hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/commands_manual.xml
Fri May 20 23:14:48 2011
@@ -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>

Modified: hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml?rev=1125594&r1=1125593&r2=1125594&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml
(original)
+++ hadoop/common/branches/yahoo-merge/src/docs/cn/src/documentation/content/xdocs/hdfs_user_guide.xml
Fri May 20 23:14:48 2011
@@ -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>

Modified: hadoop/common/branches/yahoo-merge/src/docs/src/documentation/content/xdocs/commands_manual.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/docs/src/documentation/content/xdocs/commands_manual.xml?rev=1125594&r1=1125593&r2=1125594&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/docs/src/documentation/content/xdocs/commands_manual.xml
(original)
+++ hadoop/common/branches/yahoo-merge/src/docs/src/documentation/content/xdocs/commands_manual.xml
Fri May 20 23:14:48 2011
@@ -726,7 +726,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>
@@ -763,7 +763,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>

Propchange: hadoop/common/branches/yahoo-merge/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 23:14:48 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1043117,1078148,1080396,1081598,1087844,1091618,1092565,1100026
+/hadoop/common/trunk/src/java:1043117,1078148,1080396,1081598,1082329,1087844,1091618,1092565,1100026
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Modified: hadoop/common/branches/yahoo-merge/src/java/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/core-default.xml?rev=1125594&r1=1125593&r2=1125594&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/core-default.xml (original)
+++ hadoop/common/branches/yahoo-merge/src/java/core-default.xml Fri May 20 23:14:48 2011
@@ -355,42 +355,6 @@
 </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>
   <description>Disk usage statistics refresh interval in msec.</description>

Propchange: hadoop/common/branches/yahoo-merge/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 23:14:48 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1043117,1078148,1080396,1081598,1087844,1091618,1092565,1100026
+/hadoop/common/trunk/src/test/core:1043117,1078148,1080396,1081598,1082329,1087844,1091618,1092565,1100026
 /hadoop/core/branches/branch-0.19/core/src/test/core:713112
 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278



Mime
View raw message