You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2010/06/04 18:45:27 UTC
svn commit: r951486 - in /hadoop/mapreduce/trunk: ./
src/docs/src/documentation/content/xdocs/
Author: tomwhite
Date: Fri Jun 4 16:45:27 2010
New Revision: 951486
URL: http://svn.apache.org/viewvc?rev=951486&view=rev
Log:
MAPREDUCE-1404. Move Cluster-Setup and Single-Node-Setup Docs from MapReduce to Common.
Removed:
hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/cluster_setup.xml
hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/commands_manual.xml
hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/hod_scheduler.xml
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/site.xml
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=951486&r1=951485&r2=951486&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jun 4 16:45:27 2010
@@ -807,6 +807,9 @@ Release 0.21.0 - Unreleased
MAPREDUCE-1832. Allow file sizes less than 1MB in DFSIO benchmark. (shv)
+ MAPREDUCE-1404. Move Cluster-Setup and Single-Node-Setup Docs from
+ MapReduce to Common. (tomwhite)
+
OPTIMIZATIONS
MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band
Modified: hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml?rev=951486&r1=951485&r2=951486&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml (original)
+++ hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml Fri Jun 4 16:45:27 2010
@@ -87,7 +87,7 @@
<li>
Support for refreshing/reloading some of the queue-properties
without restarting the JobTracker, taking advantage of the
- <a href="cluster_setup.html#Refreshing+queue+configuration">
+ <a href="ext:cluster-setup/RefreshingQueueConfiguration">
queue-refresh</a> feature in the framework.
</li>
</ul>
@@ -160,7 +160,7 @@
You can define multiple, possibly hierarchical queues to which users
can submit jobs with the Capacity Scheduler. To define queues,
various properties should be set in two configuration files -
- <a href="cluster_setup.html#mapred-queues.xml">mapred-queues.xml</a>
+ <a href="ext:cluster-setup/mapred-queues.xml">mapred-queues.xml</a>
and
<a href="ext:capacity-scheduler-conf">conf/capacity-scheduler.xml</a>
.</p>
@@ -194,7 +194,7 @@
<p>To specify a property for a specific queue that is defined in the
mapred-queues.xml, you should set the corresponding property in a
<property> tag explained
- <a href="cluster_setup.html#property_tag">here</a>.
+ <a href="ext:cluster-setup/property_tag">here</a>.
</p>
<p>The properties defined for queues and their descriptions are
@@ -204,7 +204,7 @@
<tr>
<th>Name</th>
<th>
- <a href="commands_manual.html#RefreshQueues">
+ <a href="ext:commands-manual/RefreshQueues">
Refresh-able?</a>
</th>
<th>Applicable to?</th>
Modified: hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=951486&r1=951485&r2=951486&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml (original)
+++ hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml Fri Jun 4 16:45:27 2010
@@ -44,7 +44,7 @@
<a href="ext:single-node-setup">Single Node Setup</a> for first-time users.
</li>
<li>
- <a href="cluster_setup.html">Cluster Setup</a> for large, distributed clusters.
+ <a href="ext:cluster-setup">Cluster Setup</a> for large, distributed clusters.
</li>
</ul>
</section>
@@ -159,7 +159,7 @@
<p>This example works with a
pseudo-distributed (<a href="ext:single-node-setup">Single Node Setup</a>)
- or fully-distributed (<a href="cluster_setup.html">Cluster Setup</a>)
+ or fully-distributed (<a href="ext:cluster-setup">Cluster Setup</a>)
Hadoop installation.</p>
<section>
@@ -392,7 +392,7 @@
provides this functionality is called the <em>distributed cache</em>.
More details about the command line options surrounding job launching
and control of the distributed cache are available at
- <a href="commands_manual.html"> Hadoop Commands Guide.</a></p>
+ <a href="ext:commands-manual"> Hadoop Commands Guide.</a></p>
<p>Hadoop ships with some example code in a jar precompiled for you;
one of these is (another) wordcount program. Here's an example
@@ -1214,7 +1214,7 @@
<p>Note: <code>mapred.{map|reduce}.child.java.opts</code> are used only
for configuring the launched child tasks from task tracker. Configuring
the memory options for daemons is documented under
- <a href="cluster_setup.html#Configuring+the+Environment+of+the+Hadoop+Daemons">
+ <a href="ext:cluster-setup/ConfiguringEnvironmentHadoopDaemons">
Configuring the Environment of the Hadoop Daemons</a> (Cluster Setup).</p>
<p>The memory available to some parts of the framework is also
@@ -1675,7 +1675,7 @@
<p>The format of a job level ACL is the same as the format for a
queue level ACL as defined in the
- <a href ="cluster_setup.html#Configuring+the+Hadoop+Daemons">
+ <a href ="ext:cluster-setup/ConfiguringHadoopDaemons">
Cluster Setup</a> documentation.
</p>
@@ -2420,7 +2420,7 @@
<p>This example needs the HDFS to be up and running, especially for the
<code>DistributedCache</code>-related features. Hence it only works with a
pseudo-distributed (<a href="ext:single-node-setup">Single Node Setup</a>)
- or fully-distributed (<a href="cluster_setup.html#Fully-Distributed+Operation">Cluster Setup</a>)
+ or fully-distributed (<a href="ext:cluster-setup/FullyDistributedOperation">Cluster Setup</a>)
Hadoop installation.</p>
<section>
Modified: hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/site.xml?rev=951486&r1=951485&r2=951486&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/site.xml (original)
+++ hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/site.xml Fri Jun 4 16:45:27 2010
@@ -34,13 +34,11 @@ See http://forrest.apache.org/docs/linki
<docs label="Getting Started">
<overview label="Overview" href="index.html" />
- <setup label="Cluster Setup" href="cluster_setup.html"/>
<mapred label="MapReduce Tutorial" href="mapred_tutorial.html" />
<streaming label="Hadoop Streaming" href="streaming.html" />
</docs>
<docs label="Guides">
- <commands label="Hadoop Commands" href="commands_manual.html" />
<distcp label="DistCp" href="distcp.html" />
<vaidya label="Vaidya" href="vaidya.html"/>
<archives label="Hadoop Archives" href="hadoop_archives.html"/>
@@ -50,7 +48,6 @@ See http://forrest.apache.org/docs/linki
<docs label="Schedulers">
<cap_scheduler label="Capacity Scheduler" href="capacity_scheduler.html"/>
<fair_scheduler label="Fair Scheduler" href="fair_scheduler.html"/>
- <cap_scheduler label="Hod Scheduler" href="hod_scheduler.html"/>
</docs>
<docs label="Miscellaneous">
@@ -83,6 +80,17 @@ See http://forrest.apache.org/docs/linki
<PreReqs href="#PreReqs" />
<Download href="#Download" />
</single-node-setup>
+ <cluster-setup href="http://hadoop.apache.org/common/docs/current/cluster_setup.html">
+ <property_tag href="#property_tag" />
+ <RefreshingQueueConfiguration href="#Refreshing+queue+configuration"/>
+ <mapred-queues.xml href="#mapred-queues.xml"/>
+ <ConfiguringEnvironmentHadoopDaemons href="#Configuring+the+Environment+of+the+Hadoop+Daemons"/>
+ <ConfiguringHadoopDaemons href="#Configuring+the+Hadoop+Daemons"/>
+ <FullyDistributedOperation href="#Fully-Distributed+Operation"/>
+ </cluster-setup>
+ <commands-manual href="http://hadoop.apache.org/common/docs/current/commands_default.html">
+ <RefreshQueues href="#RefreshQueues"/>
+ </commands-manual>
<zlib href="http://www.zlib.net/" />
<gzip href="http://www.gzip.org/" />