You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2008/12/11 02:26:13 UTC
svn commit: r725520 [2/2] - in /hadoop/core/branches/branch-0.17: ./ docs/
docs/cn/ docs/cn/images/ docs/cn/skin/ docs/cn/skin/css/
docs/cn/skin/images/ docs/cn/skin/scripts/ docs/cn/skin/translations/ src/
src/docs/cn/ src/docs/cn/changes/ src/docs/cn...
Copied: hadoop/core/branches/branch-0.17/docs/cn/linkmap.pdf (from r725508, hadoop/core/branches/branch-0.18/docs/cn/linkmap.pdf)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/docs/cn/linkmap.pdf?p2=hadoop/core/branches/branch-0.17/docs/cn/linkmap.pdf&p1=hadoop/core/branches/branch-0.18/docs/cn/linkmap.pdf&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/docs/cn/linkmap.pdf (original)
+++ hadoop/core/branches/branch-0.17/docs/cn/linkmap.pdf Wed Dec 10 17:26:05 2008
@@ -43,7 +43,7 @@
endobj
10 0 obj
<< /Type /FontDescriptor
-/FontName /1Ef714ARPLUMingCN,Light
+/FontName /9Ef9cdARPLUMingCN,Light
/FontBBox [-62 -151 1009 895]
/Flags 33
/CapHeight 603
@@ -67,13 +67,13 @@
<< /Type /Font
/Subtype /Type0
/Name /F15
-/BaseFont /1Ef714ARPLUMingCN,Light
+/BaseFont /9Ef9cdARPLUMingCN,Light
/Encoding /Identity-H
/DescendantFonts [ 13 0 R ] >>
endobj
13 0 obj
<< /Type /Font
-/BaseFont /1Ef714ARPLUMingCN,Light
+/BaseFont /9Ef9cdARPLUMingCN,Light
/Subtype /CIDFontType2
/CIDSystemInfo << /Registry (Adobe)/Ordering (UCS)/Supplement 0 >>
/FontDescriptor 10 0 R
Copied: hadoop/core/branches/branch-0.17/docs/cn/mapred_tutorial.pdf (from r725508, hadoop/core/branches/branch-0.18/docs/cn/mapred_tutorial.pdf)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/docs/cn/mapred_tutorial.pdf?p2=hadoop/core/branches/branch-0.17/docs/cn/mapred_tutorial.pdf&p1=hadoop/core/branches/branch-0.18/docs/cn/mapred_tutorial.pdf&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/docs/cn/mapred_tutorial.pdf (original)
+++ hadoop/core/branches/branch-0.17/docs/cn/mapred_tutorial.pdf Wed Dec 10 17:26:05 2008
@@ -2702,7 +2702,7 @@
endobj
336 0 obj
<< /Type /FontDescriptor
-/FontName /2E10cfARPLUMingCN,Light
+/FontName /3Ed8e3ARPLUMingCN,Light
/FontBBox [-62 -151 1009 895]
/Flags 33
/CapHeight 603
@@ -2726,13 +2726,13 @@
<< /Type /Font
/Subtype /Type0
/Name /F15
-/BaseFont /2E10cfARPLUMingCN,Light
+/BaseFont /3Ed8e3ARPLUMingCN,Light
/Encoding /Identity-H
/DescendantFonts [ 339 0 R ] >>
endobj
339 0 obj
<< /Type /Font
-/BaseFont /2E10cfARPLUMingCN,Light
+/BaseFont /3Ed8e3ARPLUMingCN,Light
/Subtype /CIDFontType2
/CIDSystemInfo << /Registry (Adobe)/Ordering (UCS)/Supplement 0 >>
/FontDescriptor 336 0 R
Copied: hadoop/core/branches/branch-0.17/docs/cn/native_libraries.pdf (from r725508, hadoop/core/branches/branch-0.18/docs/cn/native_libraries.pdf)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/docs/cn/native_libraries.pdf?p2=hadoop/core/branches/branch-0.17/docs/cn/native_libraries.pdf&p1=hadoop/core/branches/branch-0.18/docs/cn/native_libraries.pdf&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/docs/cn/native_libraries.pdf (original)
+++ hadoop/core/branches/branch-0.17/docs/cn/native_libraries.pdf Wed Dec 10 17:26:05 2008
@@ -462,7 +462,7 @@
endobj
62 0 obj
<< /Type /FontDescriptor
-/FontName /9E3ed9ARPLUMingCN,Light
+/FontName /15E1cafARPLUMingCN,Light
/FontBBox [-62 -151 1009 895]
/Flags 33
/CapHeight 603
@@ -486,13 +486,13 @@
<< /Type /Font
/Subtype /Type0
/Name /F15
-/BaseFont /9E3ed9ARPLUMingCN,Light
+/BaseFont /15E1cafARPLUMingCN,Light
/Encoding /Identity-H
/DescendantFonts [ 65 0 R ] >>
endobj
65 0 obj
<< /Type /Font
-/BaseFont /9E3ed9ARPLUMingCN,Light
+/BaseFont /15E1cafARPLUMingCN,Light
/Subtype /CIDFontType2
/CIDSystemInfo << /Registry (Adobe)/Ordering (UCS)/Supplement 0 >>
/FontDescriptor 62 0 R
@@ -586,27 +586,27 @@
xref
0 67
0000000000 65535 f
-0000086069 00000 n
-0000086148 00000 n
-0000086240 00000 n
+0000086072 00000 n
+0000086151 00000 n
+0000086243 00000 n
0000000015 00000 n
0000000071 00000 n
0000000767 00000 n
0000000887 00000 n
0000000954 00000 n
-0000086342 00000 n
+0000086345 00000 n
0000001087 00000 n
-0000086405 00000 n
+0000086408 00000 n
0000001218 00000 n
-0000086469 00000 n
+0000086472 00000 n
0000001353 00000 n
-0000086535 00000 n
+0000086538 00000 n
0000001488 00000 n
-0000086599 00000 n
+0000086602 00000 n
0000001623 00000 n
-0000086665 00000 n
+0000086668 00000 n
0000001758 00000 n
-0000086731 00000 n
+0000086734 00000 n
0000001891 00000 n
0000004239 00000 n
0000004362 00000 n
@@ -615,10 +615,10 @@
0000004849 00000 n
0000005019 00000 n
0000005205 00000 n
-0000086797 00000 n
+0000086800 00000 n
0000005336 00000 n
0000005538 00000 n
-0000086856 00000 n
+0000086859 00000 n
0000005673 00000 n
0000008204 00000 n
0000008327 00000 n
@@ -638,7 +638,7 @@
0000012072 00000 n
0000012195 00000 n
0000012222 00000 n
-0000086915 00000 n
+0000086918 00000 n
0000012409 00000 n
0000012516 00000 n
0000012638 00000 n
@@ -648,10 +648,10 @@
0000013241 00000 n
0000013487 00000 n
0000013595 00000 n
-0000013819 00000 n
-0000084251 00000 n
-0000084398 00000 n
-0000085953 00000 n
+0000013820 00000 n
+0000084252 00000 n
+0000084400 00000 n
+0000085956 00000 n
trailer
<<
/Size 67
@@ -659,5 +659,5 @@
/Info 4 0 R
>>
startxref
-86966
+86969
%%EOF
Copied: hadoop/core/branches/branch-0.17/docs/cn/quickstart.pdf (from r725508, hadoop/core/branches/branch-0.18/docs/cn/quickstart.pdf)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/docs/cn/quickstart.pdf?p2=hadoop/core/branches/branch-0.17/docs/cn/quickstart.pdf&p1=hadoop/core/branches/branch-0.18/docs/cn/quickstart.pdf&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/docs/cn/quickstart.pdf (original)
+++ hadoop/core/branches/branch-0.17/docs/cn/quickstart.pdf Wed Dec 10 17:26:05 2008
@@ -439,7 +439,7 @@
endobj
67 0 obj
<< /Type /FontDescriptor
-/FontName /19E7435ARPLUMingCN,Light
+/FontName /5Eec1cARPLUMingCN,Light
/FontBBox [-62 -151 1009 895]
/Flags 33
/CapHeight 603
@@ -463,13 +463,13 @@
<< /Type /Font
/Subtype /Type0
/Name /F15
-/BaseFont /19E7435ARPLUMingCN,Light
+/BaseFont /5Eec1cARPLUMingCN,Light
/Encoding /Identity-H
/DescendantFonts [ 70 0 R ] >>
endobj
70 0 obj
<< /Type /Font
-/BaseFont /19E7435ARPLUMingCN,Light
+/BaseFont /5Eec1cARPLUMingCN,Light
/Subtype /CIDFontType2
/CIDSystemInfo << /Registry (Adobe)/Ordering (UCS)/Supplement 0 >>
/FontDescriptor 67 0 R
@@ -587,39 +587,39 @@
xref
0 72
0000000000 65535 f
-0000104937 00000 n
-0000105023 00000 n
-0000105115 00000 n
+0000104934 00000 n
+0000105020 00000 n
+0000105112 00000 n
0000000015 00000 n
0000000071 00000 n
0000000962 00000 n
0000001082 00000 n
0000001191 00000 n
-0000105217 00000 n
+0000105214 00000 n
0000001324 00000 n
-0000105280 00000 n
+0000105277 00000 n
0000001455 00000 n
-0000105344 00000 n
+0000105341 00000 n
0000001590 00000 n
-0000105410 00000 n
+0000105407 00000 n
0000001725 00000 n
-0000105475 00000 n
+0000105472 00000 n
0000001860 00000 n
-0000105540 00000 n
+0000105537 00000 n
0000001995 00000 n
-0000105604 00000 n
+0000105601 00000 n
0000002128 00000 n
-0000105670 00000 n
+0000105667 00000 n
0000002263 00000 n
-0000105736 00000 n
+0000105733 00000 n
0000002398 00000 n
-0000105802 00000 n
+0000105799 00000 n
0000002533 00000 n
-0000105868 00000 n
+0000105865 00000 n
0000002668 00000 n
-0000105934 00000 n
+0000105931 00000 n
0000002801 00000 n
-0000105999 00000 n
+0000105996 00000 n
0000002936 00000 n
0000005090 00000 n
0000005213 00000 n
@@ -638,7 +638,7 @@
0000011885 00000 n
0000012058 00000 n
0000012229 00000 n
-0000106065 00000 n
+0000106062 00000 n
0000012397 00000 n
0000012504 00000 n
0000012682 00000 n
@@ -654,10 +654,10 @@
0000014235 00000 n
0000014416 00000 n
0000014524 00000 n
-0000014749 00000 n
-0000102842 00000 n
-0000102990 00000 n
-0000104821 00000 n
+0000014748 00000 n
+0000102841 00000 n
+0000102988 00000 n
+0000104818 00000 n
trailer
<<
/Size 72
@@ -665,5 +665,5 @@
/Info 4 0 R
>>
startxref
-106116
+106113
%%EOF
Copied: hadoop/core/branches/branch-0.17/docs/cn/streaming.pdf (from r725508, hadoop/core/branches/branch-0.18/docs/cn/streaming.pdf)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/docs/cn/streaming.pdf?p2=hadoop/core/branches/branch-0.17/docs/cn/streaming.pdf&p1=hadoop/core/branches/branch-0.18/docs/cn/streaming.pdf&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/docs/cn/streaming.pdf (original)
+++ hadoop/core/branches/branch-0.17/docs/cn/streaming.pdf Wed Dec 10 17:26:05 2008
@@ -859,7 +859,7 @@
endobj
130 0 obj
<< /Type /FontDescriptor
-/FontName /16E6223ARPLUMingCN,Light
+/FontName /10Efed7ARPLUMingCN,Light
/FontBBox [-62 -151 1009 895]
/Flags 33
/CapHeight 603
@@ -883,13 +883,13 @@
<< /Type /Font
/Subtype /Type0
/Name /F15
-/BaseFont /16E6223ARPLUMingCN,Light
+/BaseFont /10Efed7ARPLUMingCN,Light
/Encoding /Identity-H
/DescendantFonts [ 133 0 R ] >>
endobj
133 0 obj
<< /Type /Font
-/BaseFont /16E6223ARPLUMingCN,Light
+/BaseFont /10Efed7ARPLUMingCN,Light
/Subtype /CIDFontType2
/CIDSystemInfo << /Registry (Adobe)/Ordering (UCS)/Supplement 0 >>
/FontDescriptor 130 0 R
Modified: hadoop/core/branches/branch-0.17/docs/hadoop-default.html
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/docs/hadoop-default.html?rev=725520&r1=725519&r2=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/docs/hadoop-default.html (original)
+++ hadoop/core/branches/branch-0.17/docs/hadoop-default.html Wed Dec 10 17:26:05 2008
@@ -393,6 +393,141 @@
</td>
</tr>
<tr>
+<<<<<<< .working
+=======
+<td><a name="mapred.tasktracker.instrumentation">mapred.tasktracker.instrumentation</a></td><td>org.apache.hadoop.mapred.TaskTrackerMetricsInst</td><td>Expert: The instrumentation class to associate with each TaskTracker.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.tasktracker.vmem.reserved">mapred.tasktracker.vmem.reserved</a></td><td>-1</td><td>Configuration property to specify the amount of virtual memory
+ that has to be reserved by the TaskTracker for system usage (OS, TT etc).
+ The reserved virtual memory should be a part of the total virtual memory
+ available on the TaskTracker.
+
+ The reserved virtual memory and the total virtual memory values are
+ reported by the TaskTracker as part of heart-beat so that they can
+ considered by a scheduler. Please refer to the documentation of the
+ configured scheduler to see how this property is used.
+
+ These two values are also used by a TaskTracker for tracking tasks' memory
+ usage. Memory management functionality on a TaskTracker is disabled if this
+ property is set to -1, if it more than the total virtual memory on the
+ tasktracker, or if either of the values is negative.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.tasktracker.pmem.reserved">mapred.tasktracker.pmem.reserved</a></td><td>-1</td><td>Configuration property to specify the amount of physical memory
+ that has to be reserved by the TaskTracker for system usage (OS, TT etc).
+ The reserved physical memory should be a part of the total physical memory
+ available on the TaskTracker.
+
+ The reserved physical memory and the total physical memory values are
+ reported by the TaskTracker as part of heart-beat so that they can
+ considered by a scheduler. Please refer to the documentation of the
+ configured scheduler to see how this property is used.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.task.default.maxvmem">mapred.task.default.maxvmem</a></td><td>-1</td><td>
+ Cluster-wide configuration in bytes to be set by the administrators that
+ provides default amount of maximum virtual memory for job's tasks. This has
+ to be set on both the JobTracker node for the sake of scheduling decisions
+ and on the TaskTracker nodes for the sake of memory management.
+
+ If a job doesn't specify its virtual memory requirement by setting
+ mapred.task.maxvmem to -1, tasks are assured a memory limit set
+ to this property. This property is set to -1 by default.
+
+ This value should in general be less than the cluster-wide
+ configuration mapred.task.limit.maxvmem. If not or if it is not set,
+ TaskTracker's memory management will be disabled and a scheduler's memory
+ based scheduling decisions may be affected. Please refer to the
+ documentation of the configured scheduler to see how this property is used.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.task.limit.maxvmem">mapred.task.limit.maxvmem</a></td><td>-1</td><td>
+ Cluster-wide configuration in bytes to be set by the site administrators
+ that provides an upper limit on the maximum virtual memory that can be
+ specified by a job via mapred.task.maxvmem. This has to be set on both the
+ JobTracker node for the sake of scheduling decisions and on the TaskTracker
+ nodes for the sake of memory management.
+
+ The job configuration mapred.task.maxvmem should not be more than this
+ value, otherwise depending on the scheduler being configured, the job may
+ be rejected or the job configuration may just be ignored. Please refer to
+ the documentation of the configured scheduler to see how this property is
+ used.
+
+ If it is not set a TaskTracker, TaskTracker's memory management will be
+ disabled.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.task.maxvmem">mapred.task.maxvmem</a></td><td>-1</td><td>
+ The maximum amount of virtual memory any task of a job will use, in bytes.
+
+ This value will be used by TaskTrackers for monitoring the memory usage of
+ tasks of this jobs. If a TaskTracker's memory management functionality is
+ enabled, each task of this job will be allowed to use a maximum virtual
+ memory specified by this property. If the task's memory usage goes over
+ this value, the task will be failed by the TT. If not set, the
+ cluster-wide configuration mapred.task.default.maxvmem is used as the
+ default value for memory requirements. If this property cascaded with
+ mapred.task.default.maxvmem becomes equal to -1, the job's tasks will
+ not be assured any particular amount of virtual memory and may be killed by
+ a TT that intends to control the total memory usage of the tasks via memory
+ management functionality. If the memory management functionality is
+ disabled on a TT, this value is ignored.
+
+ This value should not be more than the cluster-wide configuration
+ mapred.task.limit.maxvmem.
+
+ This value may be used by schedulers that support scheduling based on job's
+ memory requirements. Please refer to the documentation of the scheduler
+ being configured to see if it does memory based scheduling and if it does,
+ how this property is used by that scheduler.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.task.maxpmem">mapred.task.maxpmem</a></td><td>-1</td><td>
+ The maximum amount of physical memory any task of a job will use in bytes.
+
+ This value may be used by schedulers that support scheduling based on job's
+ memory requirements. In general, a task of this job will be scheduled on a
+ TaskTracker, only if the amount of physical memory still unoccupied on the
+ TaskTracker is greater than or equal to this value. Different schedulers can
+ take different decisions, some might just ignore this value. Please refer to
+ the documentation of the scheduler being configured to see if it does
+ memory based scheduling and if it does, how this variable is used by that
+ scheduler.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.tasktracker.memory_calculator_plugin">mapred.tasktracker.memory_calculator_plugin</a></td><td></td><td>
+ Name of the class whose instance will be used to query memory information
+ on the tasktracker.
+
+ The class must be an instance of
+ org.apache.hadoop.util.MemoryCalculatorPlugin. If the value is null, the
+ tasktracker attempts to use a class appropriate to the platform.
+ Currently, the only platform supported is Linux.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.tasktracker.taskmemorymanager.monitoring-interval">mapred.tasktracker.taskmemorymanager.monitoring-interval</a></td><td>5000</td><td>The interval, in milliseconds, for which the tasktracker waits
+ between two cycles of monitoring its tasks' memory usage. Used only if
+ tasks' memory management is enabled via mapred.tasktracker.tasks.maxmemory.
+ </td>
+</tr>
+<tr>
+<td><a name="mapred.tasktracker.procfsbasedprocesstree.sleeptime-before-sigkill">mapred.tasktracker.procfsbasedprocesstree.sleeptime-before-sigkill</a></td><td>5000</td><td>The time, in milliseconds, the tasktracker waits for sending a
+ SIGKILL to a process that has overrun memory limits, after it has been sent
+ a SIGTERM. Used only if tasks' memory management is enabled via
+ mapred.tasktracker.tasks.maxmemory.</td>
+</tr>
+<tr>
+>>>>>>> .merge-right.r725504
<td><a name="mapred.map.tasks">mapred.map.tasks</a></td><td>2</td><td>The default number of map tasks per job. Typically set
to a prime several times greater than number of available hosts.
Ignored when mapred.job.tracker is "local".
@@ -599,6 +734,14 @@
hosts are excluded.</td>
</tr>
<tr>
+<td><a name="mapred.max.tracker.blacklists">mapred.max.tracker.blacklists</a></td><td>4</td><td>The number of blacklists for a taskTracker by various jobs
+ after which the task tracker could be blacklisted across
+ all jobs. The tracker will be given a tasks later
+ (after a day). The tracker will become a healthy
+ tracker after a restart.
+ </td>
+</tr>
+<tr>
<td><a name="mapred.max.tracker.failures">mapred.max.tracker.failures</a></td><td>4</td><td>The number of task-failures on a tasktracker of a given job
after which new tasks of that job aren't assigned to it.
</td>
Propchange: hadoop/core/branches/branch-0.17/src/docs/cn/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 10 17:26:05 2008
@@ -0,0 +1 @@
+build
Copied: hadoop/core/branches/branch-0.17/src/docs/cn/src/documentation/sitemap.xmap (from r725508, hadoop/core/branches/branch-0.18/src/docs/cn/src/documentation/sitemap.xmap)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/docs/cn/src/documentation/sitemap.xmap?p2=hadoop/core/branches/branch-0.17/src/docs/cn/src/documentation/sitemap.xmap&p1=hadoop/core/branches/branch-0.18/src/docs/cn/src/documentation/sitemap.xmap&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/docs/cn/src/documentation/sitemap.xmap (original)
+++ hadoop/core/branches/branch-0.17/src/docs/cn/src/documentation/sitemap.xmap Wed Dec 10 17:26:05 2008
@@ -21,7 +21,7 @@
<map:serializer name="fo2pdf"
src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf">
- <user-config src="/Users/oom/work/eclipse/hadoop-18/src/docs/cn/uming.conf"/>
+ <user-config src="/Users/oom/work/eclipse/hadoop-17/src/docs/cn/uming.conf"/>
</map:serializer>
</map:serializers>
</map:components>
Copied: hadoop/core/branches/branch-0.17/src/docs/cn/uming.conf (from r725508, hadoop/core/branches/branch-0.18/src/docs/cn/uming.conf)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/docs/cn/uming.conf?p2=hadoop/core/branches/branch-0.17/src/docs/cn/uming.conf&p1=hadoop/core/branches/branch-0.18/src/docs/cn/uming.conf&r1=725508&r2=725520&rev=725520&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/docs/cn/uming.conf (original)
+++ hadoop/core/branches/branch-0.17/src/docs/cn/uming.conf Wed Dec 10 17:26:05 2008
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<fonts>
- <font metrics-file="/Users/oom/work/eclipse/hadoop-18/src/docs/cn/uming.xml" kerning="yes" embed-file="/Users/oom/work/eclipse/hadoop-18/src/docs/cn/uming.ttc">
+ <font metrics-file="/Users/oom/work/eclipse/hadoop-17/src/docs/cn/uming.xml" kerning="yes" embed-file="/Users/oom/work/eclipse/hadoop-17/src/docs/cn/uming.ttc">
<font-triplet name="AR PL UMing" style="normal" weight="normal"/>
<font-triplet name="AR PL UMing" style="italic" weight="normal"/>
<font-triplet name="AR PL UMing" style="normal" weight="bold"/>