From 1112a50ad354b82afa4b7c469298be875b08cac8 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Tue, 1 Nov 2011 08:53:38 +0000 Subject: [PATCH] HADOOP-7789. Improvements to site navigation. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195876 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-common/CHANGES.txt | 2 + .../src/site/apt/index.apt.vm | 41 ++-------------- hadoop-project/src/site/apt/index.apt.vm | 48 ++++++++++++++++++- hadoop-project/src/site/site.xml | 22 +++++---- 4 files changed, 65 insertions(+), 48 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 374e6ff1976..847849ac889 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -515,6 +515,8 @@ Release 0.23.0 - 2011-11-01 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 2895fdd1f06..5f3883fd1a5 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, 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 @@ Apache Hadoop 0.23 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 463fe2c215a..fe05eebbfe2 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 48b79032718..dd3f743e332 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -46,14 +46,10 @@ - - - - - - - + + + @@ -61,14 +57,20 @@ - - - + + + + + + + + +