Browse Source

YARN-2956. Added missing links in YARN documentation. Contributed by Masatake Iwasaki

Jian He 10 years ago
parent
commit
27a489cba6

+ 3 - 0
hadoop-project/src/site/site.xml

@@ -113,6 +113,7 @@
     </menu>
     </menu>
 
 
     <menu name="YARN" inherit="top">
     <menu name="YARN" inherit="top">
+      <item name="Overview" href="hadoop-yarn/hadoop-yarn-site/index.html"/>
       <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
       <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
       <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
       <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
       <item name="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
       <item name="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
@@ -126,6 +127,8 @@
       <item name="NodeManager Restart" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRestart.html"/>
       <item name="NodeManager Restart" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRestart.html"/>
       <item name="DockerContainerExecutor" href="hadoop-yarn/hadoop-yarn-site/DockerContainerExecutor.html"/>
       <item name="DockerContainerExecutor" href="hadoop-yarn/hadoop-yarn-site/DockerContainerExecutor.html"/>
       <item name="Using CGroups" href="hadoop-yarn/hadoop-yarn-site/NodeManagerCGroups.html"/>
       <item name="Using CGroups" href="hadoop-yarn/hadoop-yarn-site/NodeManagerCGroups.html"/>
+      <item name="Secure Containers" href="hadoop-yarn/hadoop-yarn-site/SecureContainer.html"/>
+      <item name="Registry" href="hadoop-yarn/hadoop-yarn-site/registry/index.html"/>
     </menu>
     </menu>
 
 
     <menu name="YARN REST APIs" inherit="top">
     <menu name="YARN REST APIs" inherit="top">

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -174,6 +174,9 @@ Release 2.7.0 - UNRELEASED
     YARN-2996. Improved synchronization and I/O operations of FS- and Mem-
     YARN-2996. Improved synchronization and I/O operations of FS- and Mem-
     RMStateStore. (Yi Liu via zjshen)
     RMStateStore. (Yi Liu via zjshen)
 
 
+    YARN-2956. Added missing links in YARN documentation. (Masatake Iwasaki via
+    jianhe)
+
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
   BUG FIXES
   BUG FIXES

+ 33 - 15
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 
   library and is tasked with negotiating resources from the ResourceManager and 
   working with the NodeManager(s) to execute and monitor the tasks.
   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
 
 
-  * {{{./CapacityScheduler.html}Capacity Scheduler}}
+* YARN
 
 
+  * {{{./YARN.html}YARN Architecture}}
+ 
+  * {{{./CapacityScheduler.html}Capacity Scheduler}}
+ 
   * {{{./FairScheduler.html}Fair Scheduler}}
   * {{{./FairScheduler.html}Fair Scheduler}}
-
+ 
+  * {{{./ResourceManagerRestart.htaml}ResourceManager Restart}}
+ 
+  * {{{./ResourceManagerHA.html}ResourceManager HA}}
+ 
   * {{{./WebApplicationProxy.html}Web Application Proxy}}
   * {{{./WebApplicationProxy.html}Web Application Proxy}}
-
+ 
   * {{{./TimelineServer.html}YARN Timeline Server}}
   * {{{./TimelineServer.html}YARN Timeline Server}}
-  
-  * {{{./SecureContainer.html}YARN Secure Containers}}
+ 
+  * {{{./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}}
 
 
-  * {{{../../hadoop-project-dist/hadoop-common/CLIMiniCluster.html}CLI MiniCluster}}
+* YARN REST APIs
 
 
-  * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html}Backward Compatibility between Apache Hadoop 1.x and 2.x for MapReduce}}
+  * {{{./WebServicesIntro.html}Introduction}}
 
 
-  * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html}Encrypted Shuffle}}
+  * {{{./ResourceManagerRest.html}Resource Manager}}
 
 
-  * {{{./registry/index.html}Registry}}
+  * {{{./NodeManagerRest.html}Node Manager}}