Author: ddas
Date: Thu Mar 19 12:04:44 2009
New Revision: 755956
URL: http://svn.apache.org/viewvc?rev=755956&view=rev
Log:
Merge -r 755937:755938 from trunk onto 0.20 branch. Fixes HADOOP-5522.
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 12:04:44 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=755956&r1=755955&r2=755956&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Mar 19 12:04:44 2009
@@ -822,6 +822,9 @@
HADOOP-5259. Job with output hdfs:/user/<username>/outputpath (no
authority) fails with Wrong FS. (Doug Cutting via hairong)
+ HADOOP-5522. Documents the setup/cleanup tasks in the mapred tutorial.
+ (Amareshwari Sriramadasu via ddas)
+
Release 0.19.1 - 2009-02-23
IMPROVEMENTS
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 12:04:44 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938
Modified:
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=755956&r1=755955&r2=755956&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
(original)
+++
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Thu Mar 19 12:04:44 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>
