From 68709cb9beca1523899b3e4932cfa47b5cd651ed Mon Sep 17 00:00:00 2001 From: Jian He Date: Fri, 9 Jan 2015 17:46:36 -0800 Subject: [PATCH] YARN-2956. Added missing links in YARN documentation. Contributed by Masatake Iwasaki (cherry picked from commit 27a489cba63d9473e4cbcaef018b66108fb6c122) --- hadoop-project/src/site/site.xml | 3 ++ hadoop-yarn-project/CHANGES.txt | 3 ++ .../src/site/apt/index.apt.vm | 54 ++++++++++++------- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml index f0e2e099352..100eb1f6127 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -114,6 +114,7 @@ + @@ -127,6 +128,8 @@ + + diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 8294853a640..e2f625008d8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -140,6 +140,9 @@ Release 2.7.0 - UNRELEASED YARN-2996. Improved synchronization and I/O operations of FS- and Mem- RMStateStore. (Yi Liu via zjshen) + YARN-2956. Added missing links in YARN documentation. (Masatake Iwasaki via + jianhe) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm index 79b8e1125ed..43e5b028986 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm @@ -36,29 +36,47 @@ MapReduce NextGen aka YARN aka MRv2 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 {{{./YARN.html}YARN}} - document. + More details are available in the {{{./YARN.html}Architecture}} document. -* Documentation - * {{{./YARN.html}NextGen MapReduce}} - - * {{{./WritingYarnApplications.html}Writing YARN Applications}} +Documentation Index +* YARN + + * {{{./YARN.html}YARN Architecture}} + * {{{./CapacityScheduler.html}Capacity Scheduler}} - + * {{{./FairScheduler.html}Fair Scheduler}} - + + * {{{./ResourceManagerRestart.htaml}ResourceManager Restart}} + + * {{{./ResourceManagerHA.html}ResourceManager HA}} + * {{{./WebApplicationProxy.html}Web Application Proxy}} - + * {{{./TimelineServer.html}YARN Timeline Server}} - - * {{{./SecureContainer.html}YARN Secure Containers}} - - * {{{../../hadoop-project-dist/hadoop-common/CLIMiniCluster.html}CLI MiniCluster}} - - * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html}Backward Compatibility between Apache Hadoop 1.x and 2.x for MapReduce}} - - * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html}Encrypted Shuffle}} - + + * {{{./WritingYarnApplications.html}Writing YARN Applications}} + + * {{{./YarnCommands.html}YARN Commands}} + + * {{{hadoop-sls/SchedulerLoadSimulator.html}Scheduler Load Simulator}} + + * {{{./NodeManagerRestart.html}NodeManager Restart}} + + * {{{./DockerContainerExecutor.html}DockerContainerExecutor}} + + * {{{./NodeManagerCGroups.html}Using CGroups}} + + * {{{./SecureContainer.html}Secure Containers}} + * {{{./registry/index.html}Registry}} + +* YARN REST APIs + + * {{{./WebServicesIntro.html}Introduction}} + + * {{{./ResourceManagerRest.html}Resource Manager}} + + * {{{./NodeManagerRest.html}Node Manager}}