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
