Merge -c 1195876 from trunk to branch-0.23 to fix HADOOP-7789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195878 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index d6a9618..b232cf7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -439,6 +439,8 @@
HADOOP-7782. Aggregate project javadocs. (tomwhite)
+ HADOOP-7789. Improvements to site navigation. (acmurthy)
+
OPTIMIZATIONS
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
index 2895fdd..5f3883f 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
@@ -11,32 +11,12 @@
~~ limitations under the License. See accompanying LICENSE file.
---
- Apache Hadoop 0.23
+ Apache Hadoop NextGen MapReduce
---
---
${maven.build.timestamp}
-
-Apache Hadoop 0.23
-
- Apache Hadoop 0.23 consists of significant improvements over the previous
- stable release (hadoop-0.20.205).
-
- Here is a short overview of the improvments to both HDFS and MapReduce.
-
-* {HDFS Federation}
-
- In order to scale the name service horizontally, <federation> uses multiple
- independent Namenodes/Namespaces. The Namenodes are federated, that is, the
- Namenodes are independent and don't require coordination with each other.
- The datanodes are used as common storage for blocks by all the Namenodes.
- Each datanode registers with all the Namenodes in the cluster. Datanodes
- send periodic heartbeats and block reports and handles commands from the
- Namenodes.
-
- More details are available in the {{{./Federation.html}HDFS Federation}}
- document.
-* {MapReduce NextGen aka YARN aka MRv2}
+MapReduce NextGen aka YARN aka MRv2
The new architecture introduced in hadoop-0.23, divides the two major
functions of the JobTracker: resource management and job life-cycle management
@@ -59,23 +39,12 @@
More details are available in the {{{./YARN.html}YARN}}
document.
-* Release Documentation
-
- * {{{./SingleCluster.html}Setting up a Single Node Cluster}}
-
- * {{{./ClusterSetup.html}Setting up a full-fledged Hadoop Cluster}}
-
- * {{{./CapacityScheduler.html}Capacity Scheduler}}
-
- * {{{./Federation.html}HDFS Federation feature description, configuration and
- management}}
+* Documentation
* {{{./YARN.html}NextGen MapReduce}}
-
-* User Documentation
-
+
* {{{./WritingYarnApplications.html}Writing Yarn Applications}}
- * {{{./apidocs/index.html}JavaDocs}}
+ * {{{./CapacityScheduler.html}Capacity Scheduler}}
diff --git a/hadoop-project/src/site/apt/index.apt.vm b/hadoop-project/src/site/apt/index.apt.vm
index 463fe2c..fe05eeb 100644
--- a/hadoop-project/src/site/apt/index.apt.vm
+++ b/hadoop-project/src/site/apt/index.apt.vm
@@ -11,12 +11,56 @@
~~ limitations under the License. See accompanying LICENSE file.
---
- Hadoop ${project.version}
+ Apache Hadoop ${project.version}
---
---
${maven.build.timestamp}
-
+Apache Hadoop 0.23
+
+ Apache Hadoop 0.23 consists of significant improvements over the previous
+ stable release (hadoop-0.20.205).
+
+ Here is a short overview of the improvments to both HDFS and MapReduce.
+
+ * {HDFS Federation}
+
+ In order to scale the name service horizontally, federation uses multiple
+ independent Namenodes/Namespaces. The Namenodes are federated, that is, the
+ Namenodes are independent and don't require coordination with each other.
+ The datanodes are used as common storage for blocks by all the Namenodes.
+ Each datanode registers with all the Namenodes in the cluster. Datanodes
+ send periodic heartbeats and block reports and handles commands from the
+ Namenodes.
+
+ More details are available in the
+ {{{./hadoop-yarn/hadoop-yarn-site/Federation.html}HDFS Federation}}
+ document.
+
+ * {MapReduce NextGen aka YARN aka MRv2}
+
+ The new architecture introduced in hadoop-0.23, divides the two major
+ functions of the JobTracker: resource management and job life-cycle management
+ into separate components.
+
+ The new ResourceManager manages the global assignment of compute resources to
+ applications and the per-application ApplicationMaster manages the
+ application’s scheduling and coordination.
+
+ An application is either a single job in the sense of classic MapReduce jobs
+ or a DAG of such jobs.
+
+ The ResourceManager and per-machine NodeManager daemon, which manages the
+ user processes on that machine, form the computation fabric.
+
+ The per-application ApplicationMaster is, in effect, a framework specific
+ library and is tasked with negotiating resources from the ResourceManager and
+ working with the NodeManager(s) to execute and monitor the tasks.
+
+ More details are available in the
+ {{{./hadoop-yarn/hadoop-yarn-site/YARN.html}YARN}}
+ document.
+
Getting Started
The Hadoop documentation includes the information you need to get started using
diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
index 48b7903..dd3f743 100644
--- a/hadoop-project/src/site/site.xml
+++ b/hadoop-project/src/site/site.xml
@@ -46,14 +46,10 @@
<item name="Hadoop" href="http://hadoop.apache.org/"/>
</breadcrumbs>
- <menu name="Auth" inherit="top">
- <item name="Overview" href="hadoop-auth/index.html"/>
- <item name="Examples" href="hadoop-auth/Examples.html"/>
- <item name="Configuration" href="hadoop-auth/Configuration.html"/>
- <item name="Building" href="hadoop-auth/BuildingIt.html"/>
- </menu>
-
<menu name="Common" inherit="top">
+ <item name="Overview" href="index.html"/>
+ <item name="Single Node Setup" href="hadoop-yarn/hadoop-yarn-site/SingleCluster.html"/>
+ <item name="Cluster Setup" href="hadoop-yarn/hadoop-yarn-site/ClusterSetup.html"/>
</menu>
<menu name="HDFS" inherit="top">
@@ -61,14 +57,20 @@
</menu>
<menu name="MapReduce" inherit="top">
- <item name="Overview" href="hadoop-yarn/hadoop-yarn-site/index.html"/>
- <item name="Single Node Setup" href="hadoop-yarn/hadoop-yarn-site/SingleCluster.html"/>
- <item name="Cluster Setup" href="hadoop-yarn/hadoop-yarn-site/ClusterSetup.html"/>
+ <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
<item name="Writing Yarn Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
<item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
</menu>
+ <menu name="Auth" inherit="top">
+ <item name="Overview" href="hadoop-auth/index.html"/>
+ <item name="Examples" href="hadoop-auth/Examples.html"/>
+ <item name="Configuration" href="hadoop-auth/Configuration.html"/>
+ <item name="Building" href="hadoop-auth/BuildingIt.html"/>
+ </menu>
+
<menu name="Reference" inherit="top">
+ <item name="Release Notes" href="hadoop-project-dist/hadoop-common/releasenotes.html"/>
<item name="API docs" href="api/index.html"/>
<item name="core-default.xml" href="hadoop-project-dist/hadoop-common/core-default.xml"/>
<item name="hdfs-default.xml" href="hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
