Author: ddas
Date: Thu Mar 19 12:01:28 2009
New Revision: 755955
URL: http://svn.apache.org/viewvc?rev=755955&view=rev
Log:
Merge -r 755937:755938 from trunk onto 0.19 branch. Fixes HADOOP-5522.
Modified:
hadoop/core/branches/branch-0.19/ (props changed)
hadoop/core/branches/branch-0.19/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 12:01:28 2009
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,709040,709303,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,736426,738697,740077,741703,741762,743745,743892,745180,746902-746903,752073,752609,752836,753112-753113,753346,755370
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,709040,709303,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,736426,738697,740077,741703,741762,743745,743892,745180,746902-746903,752073,752609,752836,753112-753113,753346,755370,755938
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=755955&r1=755954&r2=755955&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Mar 19 12:01:28 2009
@@ -77,7 +77,10 @@
HADOOP-5479. NameNode should not send empty block replication request to
DataNode. (hairong)
-Release 0.19.1 - 2009-02-23
+ HADOOP-5522. Documents the setup/cleanup tasks in the mapred tutorial.
+ (Amareshwari Sriramadasu via ddas)
+
+Release 0.19.1 - 2009-02-23
HADOOP-5225. Workaround for tmp file handling in HDFS. sync() is
incomplete as a result. committed only to 0.19.x. (Raghu Angadi)
Propchange: hadoop/core/branches/branch-0.19/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 12:01:28 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.20/CHANGES.txt:752591
-/hadoop/core/trunk/CHANGES.txt:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,708723,709040,709303,711717,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,735082,736426,738697,740077,741703,741762,743296,743745,743892,745180,746902-746903,752073,752590,752609,752836,753112-753113,753346,755370
+/hadoop/core/trunk/CHANGES.txt:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,708723,709040,709303,711717,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,735082,736426,738697,740077,741703,741762,743296,743745,743892,745180,746902-746903,752073,752590,752609,752836,753112-753113,753346,755370,755938
Modified:
hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=755955&r1=755954&r2=755955&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
(original)
+++
hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Thu Mar 19 12:01:28 2009
@@ -1591,13 +1591,20 @@
Setup the job during initialization. For example, create
the temporary output directory for the job during the
initialization of the job.
+ Job setup is done by a separate task when the job is
+ in PREP state and after initializing tasks. Once the setup task
+ completes, the job will be moved to RUNNING state.
</li>
<li>
Cleanup the job after the job completion. For example, remove the
temporary output directory after the job completion.
+ Job cleanup is done by a separate task at the end of the job.
+ Job is declared SUCCEDED/FAILED/KILLED after the cleanup
+ task completes.
</li>
<li>
Setup the task temporary output.
+ Task setup is done as part of the same task, during task
initialization.
</li>
<li>
Check whether a task needs a commit. This is to avoid the commit
@@ -1605,13 +1612,20 @@
</li>
<li>
Commit of the task output.
+ Once task is done, the task will commit it's output if required.
</li>
<li>
Discard the task commit.
+ If the task has been failed/killed, the output will be cleaned-up.
+ If task could not cleanup (in exception block), a separate task
+ will be launched with same attempt-id to do the cleanup.
</li>
</ol>
<p><code>FileOutputCommitter</code> is the default
- <code>OutputCommitter</code>.</p>
+ <code>OutputCommitter</code>. Job setup/cleanup tasks occupy
+ map or reduce slots, whichever is free on the TaskTracker. And
+ JobCleanup task, TaskCleanup tasks and JobSetup task have the highest
+ priority, and in that order.</p>
</section>
<section>
